mirror of
https://git.launchpad.net/~ubuntu-release/britney/+git/britney2-ubuntu
synced 2025-03-13 04:11:07 +00:00
Fix a crash during installability testing
Signed-off-by: Adam D. Barratt <adam@adam-barratt.org.uk>
This commit is contained in:
parent
03d15c2ae5
commit
4f48872102
@ -280,10 +280,6 @@ class InstallabilityTester(object):
|
||||
# is smaller than testing (so presumably faster)
|
||||
remain = choice - never - cbroken
|
||||
|
||||
if not remain:
|
||||
# all alternatives would violate the conflicts => package is not installable
|
||||
return None
|
||||
|
||||
if len(remain) > 1 and not remain.isdisjoint(safe_set):
|
||||
first = None
|
||||
for r in ifilter(safe_set.__contains__, remain):
|
||||
@ -305,6 +301,12 @@ class InstallabilityTester(object):
|
||||
check.update(remain)
|
||||
musts.update(remain)
|
||||
continue
|
||||
|
||||
if not remain:
|
||||
# all alternatives would violate the conflicts or are uninstallable
|
||||
# => package is not installable
|
||||
return None
|
||||
|
||||
# The choice is still deferred
|
||||
rebuild.add(frozenset(remain))
|
||||
|
||||
|
Loading…
x
Reference in New Issue
Block a user