mirror of
https://git.launchpad.net/~ubuntu-release/britney/+git/britney2-ubuntu
synced 2025-05-21 23:41:31 +00:00
Fixed a bug in iter_packages for single-arch operations.
This commit is contained in:
parent
0cc91e9a28
commit
f96887ca41
@ -281,6 +281,7 @@ class Britney:
|
|||||||
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]
|
||||||
arches += [x for x in allarches if x not in arches and x not in self.options.fucked_arches]
|
arches += [x for x in allarches if x not in arches and x not in self.options.fucked_arches]
|
||||||
arches += [x for x in allarches if x not in arches and x not in self.options.break_arches]
|
arches += [x for x in allarches if x not in arches and x not in self.options.break_arches]
|
||||||
|
arches += [x for x in allarches if x not in arches and x not in self.options.new_arches]
|
||||||
arches += [x for x in allarches if x not in arches]
|
arches += [x for x in allarches if x not in arches]
|
||||||
self.options.architectures = arches
|
self.options.architectures = arches
|
||||||
|
|
||||||
@ -1308,6 +1309,7 @@ class Britney:
|
|||||||
e.addhtml("Unpossible dep: %s -> %s" % (e.name, d))
|
e.addhtml("Unpossible dep: %s -> %s" % (e.name, d))
|
||||||
self.invalidate_excuses(upgrade_me, unconsidered)
|
self.invalidate_excuses(upgrade_me, unconsidered)
|
||||||
|
|
||||||
|
# sort the list of candidates
|
||||||
self.upgrade_me = sorted(upgrade_me)
|
self.upgrade_me = sorted(upgrade_me)
|
||||||
|
|
||||||
# write excuses to the output file
|
# write excuses to the output file
|
||||||
@ -1531,8 +1533,8 @@ class Britney:
|
|||||||
if b not in nuninst[arch]:
|
if b not in nuninst[arch]:
|
||||||
nuninst[arch].append(b)
|
nuninst[arch].append(b)
|
||||||
|
|
||||||
if arch not in self.options.break_arches and \
|
if (("/" in pkg and arch not in self.options.new_arches) or \
|
||||||
len(nuninst[arch]) > len(nuninst_comp[arch]):
|
(arch not in self.options.break_arches)) and len(nuninst[arch]) > len(nuninst_comp[arch]):
|
||||||
better = False
|
better = False
|
||||||
break
|
break
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user