Lubuntu/britney2-ubuntu
8
0
Fork 0
mirror of https://git.launchpad.net/~ubuntu-release/britney/+git/britney2-ubuntu synced 2025-05-23 08:21:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

britney.py: typo fixes

Browse Source 
Signed-off-by: Adam D. Barratt <adam@adam-barratt.org.uk>
This commit is contained in:
Adam D. Barratt 2015-04-27 19:14:08 +00:00
parent d8fa67cee8
commit 18885d3f3b
1 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
britney.py
View File

@ -284,7 +284,7 @@ class Britney(object):
if hasattr(self.options, 'pu'): if hasattr(self.options, 'pu'):
self.binaries['pu'][arch] = self.read_binaries(self.options.pu, "pu", arch) self.binaries['pu'][arch] = self.read_binaries(self.options.pu, "pu", arch)
else: else:
# _build_installability_tester relies it being # _build_installability_tester relies on it being
# properly initialised, so insert two empty dicts # properly initialised, so insert two empty dicts
# here. # here.
self.binaries['pu'][arch] = ({}, {}) self.binaries['pu'][arch] = ({}, {})
@ -335,7 +335,7 @@ class Britney(object):
suites = [s for s in self.binaries if arch in self.binaries[s]] suites = [s for s in self.binaries if arch in self.binaries[s]]
# NB: ESSENTIAL deliberately skipped as the 2011 and 2012 # NB: ESSENTIAL deliberately skipped as the 2011 and 2012
# parts of the live-data tests requires it (britney merges # parts of the live-data tests require it (britney merges
# this field correctly from the unstable version where # this field correctly from the unstable version where
# available) # available)
check_field_name = dict( (globals()[fn], fn) for fn in check_field_name = dict( (globals()[fn], fn) for fn in
@ -403,7 +403,7 @@ class Britney(object):
if self.options.nuninst_cache and self.options.print_uninst: if self.options.nuninst_cache and self.options.print_uninst:
self.__log("nuninst_cache and print_uninst are mutually exclusive!", type="E") self.__log("nuninst_cache and print_uninst are mutually exclusive!", type="E")
sys.exit(1) sys.exit(1)
# if the configuration file exists, than read it and set the additional options # if the configuration file exists, then read it and set the additional options
elif not os.path.isfile(self.options.config): elif not os.path.isfile(self.options.config):
self.__log("Unable to read the configuration file (%s), exiting!" % self.options.config, type="E") self.__log("Unable to read the configuration file (%s), exiting!" % self.options.config, type="E")
sys.exit(1) sys.exit(1)
@ -474,7 +474,7 @@ class Britney(object):
conflicts = [] conflicts = []
possible_dep_ranges = {} possible_dep_ranges = {}
# We do not differ between depends and pre-depends # We do not differentiate between depends and pre-depends
if pkgdata[DEPENDS]: if pkgdata[DEPENDS]:
depends.extend(apt_pkg.parse_depends(pkgdata[DEPENDS], False)) depends.extend(apt_pkg.parse_depends(pkgdata[DEPENDS], False))
@ -493,7 +493,7 @@ class Britney(object):
pkgs = solvers(block, arch, dep_dist) pkgs = solvers(block, arch, dep_dist)
for p in pkgs: for p in pkgs:
# version and arch is already interned, but solvers use # version and arch is already interned, but solvers use
# the package name extracted from the field and is therefore # the package name extracted from the field and it is therefore
# not interned. # not interned.
pdata = binaries[dep_dist][arch][0][p] pdata = binaries[dep_dist][arch][0][p]
pt = (sys.intern(p), pdata[VERSION], arch) pt = (sys.intern(p), pdata[VERSION], arch)
@ -634,7 +634,7 @@ class Britney(object):
# Merge Pre-Depends with Depends and Conflicts with # Merge Pre-Depends with Depends and Conflicts with
# Breaks. Britney is not interested in the "finer # Breaks. Britney is not interested in the "finer
# semantical differences" of these fields anyway. # semantic differences" of these fields anyway.
pdeps = get_field('Pre-Depends') pdeps = get_field('Pre-Depends')
deps = get_field('Depends') deps = get_field('Depends')
if deps and pdeps: if deps and pdeps:
@ -897,7 +897,7 @@ class Britney(object):
if l[0] == 'finished': if l[0] == 'finished':
break break
if l[0] == 'remark': if l[0] == 'remark':
# Ignore "no-op" hint, which sole purpose is to be # Ignore "no-op" hint, the sole purpose of which is to be
# found by hint grep (and show up in "d"'s # found by hint grep (and show up in "d"'s
# output). # output).
continue continue
@ -966,7 +966,7 @@ class Britney(object):
packages = [] packages = []
# local copies for better performances # local copies for better performance
binaries = self.binaries[distribution][arch] binaries = self.binaries[distribution][arch]
# for every package, version and operation in the block # for every package, version and operation in the block
@ -1071,7 +1071,7 @@ class Britney(object):
# if the source package is available in unstable, then do nothing # if the source package is available in unstable, then do nothing
if pkg in self.sources['unstable']: if pkg in self.sources['unstable']:
return False return False
# otherwise, add a new excuse for its removal and return True # otherwise, add a new excuse for its removal
src = self.sources['testing'][pkg] src = self.sources['testing'][pkg]
excuse = Excuse("-" + pkg) excuse = Excuse("-" + pkg)
excuse.addhtml("Package not in unstable, will try to remove") excuse.addhtml("Package not in unstable, will try to remove")
@ -1425,7 +1425,7 @@ class Britney(object):
pkgsv = binary_u[SOURCEVER] pkgsv = binary_u[SOURCEVER]
# if it wasn't built by the same source, it is out-of-date # if it wasn't built by the same source, it is out-of-date
# it there is at least one binary which is up-to-date, there # if there is at least one binary which is up-to-date, there
# is a build on this arch # is a build on this arch
if not same_source(source_u[VERSION], pkgsv): if not same_source(source_u[VERSION], pkgsv):
if pkgsv not in oodbins: if pkgsv not in oodbins:
@ -2023,7 +2023,7 @@ class Britney(object):
affected = set() affected = set()
# local copies for better performances # local copies for better performance
sources = self.sources sources = self.sources
packages_t = self.binaries['testing'] packages_t = self.binaries['testing']
get_reverse_tree = partial(compute_reverse_tree, packages_t) get_reverse_tree = partial(compute_reverse_tree, packages_t)