Updates for arm/armel.

bzr-import-20160707
Fabio Tranchitella 17 years ago
parent 5db6d600a8
commit 2cb47f7af2

@ -337,7 +337,7 @@ class Britney:
# Sort the architecture list # Sort the architecture list
allarches = sorted(self.options.architectures.split()) allarches = sorted(self.options.architectures.split())
arches = [x for x in allarches if x in self.options.nobreakall_arches] arches = [x for x in allarches if x in self.options.nobreakall_arches.split()]
arches += [x for x in allarches if x not in arches and x not in self.options.fucked_arches.split()] arches += [x for x in allarches if x not in arches and x not in self.options.fucked_arches.split()]
arches += [x for x in allarches if x not in arches and x not in self.options.break_arches.split()] arches += [x for x in allarches if x not in arches and x not in self.options.break_arches.split()]
arches += [x for x in allarches if x not in arches and x not in self.options.new_arches.split()] arches += [x for x in allarches if x not in arches and x not in self.options.new_arches.split()]
@ -988,7 +988,8 @@ class Britney:
# if no package can satisfy the dependency, add this information to the excuse # if no package can satisfy the dependency, add this information to the excuse
if len(packages) == 0: if len(packages) == 0:
excuse.addhtml("%s/%s unsatisfiable %s: %s" % (pkg, arch, type, block_txt.strip())) excuse.addhtml("%s/%s unsatisfiable %s: %s" % (pkg, arch, type, block_txt.strip()))
if arch not in self.options.break_arches: excuse.add_unsat_dep(arch) if arch not in self.options.break_arches.split():
excuse.add_unsat_dep(arch)
continue continue
# for the solving packages, update the excuse to add the dependencies # for the solving packages, update the excuse to add the dependencies
@ -1277,7 +1278,7 @@ class Britney:
# if the package is architecture-dependent or the current arch is `nobreakall' # if the package is architecture-dependent or the current arch is `nobreakall'
# find unsatisfied dependencies for the binary package # find unsatisfied dependencies for the binary package
if binary_u[ARCHITECTURE] != 'all' or arch in self.options.nobreakall_arches: if binary_u[ARCHITECTURE] != 'all' or arch in self.options.nobreakall_arches.split():
self.excuse_unsat_deps(pkg, src, arch, suite, excuse) self.excuse_unsat_deps(pkg, src, arch, suite, excuse)
# if there are out-of-date packages, warn about them in the excuse and set update_candidate # if there are out-of-date packages, warn about them in the excuse and set update_candidate
@ -1294,7 +1295,7 @@ class Britney:
"arch=%s&pkg=%s&ver=%s\" target=\"_blank\">%s</a>: %s" % \ "arch=%s&pkg=%s&ver=%s\" target=\"_blank\">%s</a>: %s" % \
(arch, src, source_u[VERSION], arch, oodtxt) (arch, src, source_u[VERSION], arch, oodtxt)
if arch in self.options.fucked_arches: if arch in self.options.fucked_arches.split():
text = text + " (but %s isn't keeping up, so nevermind)" % (arch) text = text + " (but %s isn't keeping up, so nevermind)" % (arch)
else: else:
update_candidate = False update_candidate = False
@ -1564,7 +1565,7 @@ class Britney:
for arch in self.options.architectures: for arch in self.options.architectures:
if requested_arch and arch != requested_arch: continue if requested_arch and arch != requested_arch: continue
# if it is in the nobreakall ones, check arch-indipendent packages too # if it is in the nobreakall ones, check arch-indipendent packages too
if arch not in self.options.nobreakall_arches: if arch not in self.options.nobreakall_arches.split():
skip_archall = True skip_archall = True
else: skip_archall = False else: skip_archall = False
@ -1610,7 +1611,7 @@ class Britney:
elif original and arch in original: elif original and arch in original:
n = len(original[arch]) n = len(original[arch])
else: continue else: continue
if arch in self.options.break_arches: if arch in self.options.break_arches.split():
totalbreak = totalbreak + n totalbreak = totalbreak + n
else: else:
total = total + n total = total + n
@ -1635,7 +1636,7 @@ class Britney:
def is_nuninst_asgood_generous(self, old, new): def is_nuninst_asgood_generous(self, old, new):
diff = 0 diff = 0
for arch in self.options.architectures: for arch in self.options.architectures:
if arch in self.options.break_arches: continue if arch in self.options.break_arches.split(): continue
diff = diff + (len(new[arch]) - len(old[arch])) diff = diff + (len(new[arch]) - len(old[arch]))
return diff <= 0 return diff <= 0
@ -2094,9 +2095,9 @@ class Britney:
sources = self.sources sources = self.sources
systems = self.systems systems = self.systems
architectures = self.options.architectures architectures = self.options.architectures
nobreakall_arches = self.options.nobreakall_arches nobreakall_arches = self.options.nobreakall_arches.split()
new_arches = self.options.new_arches new_arches = self.options.new_arches.split()
break_arches = self.options.break_arches break_arches = self.options.break_arches.split()
dependencies = self.dependencies dependencies = self.dependencies
compatible = self.options.compatible compatible = self.options.compatible

Loading…
Cancel
Save