Lubuntu/britney2-ubuntu
8
0
Fork 0
mirror of https://git.launchpad.net/~ubuntu-release/britney/+git/britney2-ubuntu synced 2025-02-13 23:38:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

Let hintdir specific the actual directory of hints files

Browse Source 
Signed-off-by: Niels Thykier <niels@thykier.net>
This commit is contained in:
Niels Thykier 2016-05-26 16:49:09 +00:00
parent 1ee1375d38
commit c14ee0410b
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
britney.py
View File

@ -278,7 +278,7 @@ class Britney(object):
try:
self.hints = self.read_hints(self.options.hintsdir)
except AttributeError:
self.hints = self.read_hints(self.options.unstable)
self.hints = self.read_hints(os.path.join(self.options.unstable, 'Hints'))
if self.options.nuninst_cache:
self.log("Not building the list of non-installable packages, as requested", type="I")
@ -999,11 +999,11 @@ class Britney(object):
# return a tuple with the list of real and virtual packages
return (packages, provides)
def read_hints(self, basedir):
def read_hints(self, hintsdir):
"""Read the hint commands from the specified directory
The hint commands are read from the files contained in the `Hints'
directory within the directory specified as `basedir' parameter.
The hint commands are read from the files contained in the directory
specified by the `hintsdir' parameter.
The names of the files have to be the same as the authorized users
for the hints.
@ -1022,7 +1022,7 @@ class Britney(object):
filename = '<cmd-line>'
hint_parser.parse_hints(who, self.HINTS[who], filename, lines)
else:
filename = os.path.join(basedir, "Hints", who)
filename = os.path.join(hintsdir, who)
if not os.path.isfile(filename):
self.log("Cannot read hints list from %s, no such file!" % filename, type="E")
continue