mirror of
https://git.launchpad.net/~ubuntu-release/britney/+git/britney2-ubuntu
synced 2025-05-06 08:01:41 +00:00
Correctly handle uninstallable arch:all to installable arch:any moves
If the package was previously arch:all and uninstallable and has moved to being architecture-dependent, becoming installable in the process, then it will not be in the architecture-dependent uninstallability set; we therefore should try removing it from that set.
This commit is contained in:
parent
cfe3f37bb5
commit
89ace6b7f7
13
britney.py
13
britney.py
@ -2241,8 +2241,15 @@ class Britney:
|
|||||||
to_check.append(p)
|
to_check.append(p)
|
||||||
broken.remove(p)
|
broken.remove(p)
|
||||||
if not (skip_archall and binaries[arch][0][p][ARCHITECTURE] == 'all'):
|
if not (skip_archall and binaries[arch][0][p][ARCHITECTURE] == 'all'):
|
||||||
|
# if the package was previously arch:all and uninstallable
|
||||||
|
# and has moved to being architecture-dependent, becoming
|
||||||
|
# installable in the process then it will not be in the
|
||||||
|
# architecture-dependent uninstallability set; therefore,
|
||||||
|
# don't try removing it
|
||||||
|
if p in nuninst[arch]:
|
||||||
nuninst[arch].remove(p)
|
nuninst[arch].remove(p)
|
||||||
|
|
||||||
|
|
||||||
# broken packages (second round, reverse dependencies of the first round)
|
# broken packages (second round, reverse dependencies of the first round)
|
||||||
while to_check:
|
while to_check:
|
||||||
j = to_check.pop(0)
|
j = to_check.pop(0)
|
||||||
@ -2259,6 +2266,12 @@ class Britney:
|
|||||||
broken.remove(p)
|
broken.remove(p)
|
||||||
to_check.append(p)
|
to_check.append(p)
|
||||||
if not (skip_archall and binaries[arch][0][p][ARCHITECTURE] == 'all'):
|
if not (skip_archall and binaries[arch][0][p][ARCHITECTURE] == 'all'):
|
||||||
|
# if the package was previously arch:all and uninstallable
|
||||||
|
# and has moved to being architecture-dependent, becoming
|
||||||
|
# installable in the process then it will not be in the
|
||||||
|
# architecture-dependent uninstallability set; therefore,
|
||||||
|
# don't try removing it
|
||||||
|
if p in nuninst[arch]:
|
||||||
nuninst[arch].remove(p)
|
nuninst[arch].remove(p)
|
||||||
|
|
||||||
# if we are processing hints, go ahead
|
# if we are processing hints, go ahead
|
||||||
|
Loading…
x
Reference in New Issue
Block a user