mirror of
https://git.launchpad.net/~ubuntu-release/britney/+git/britney2-ubuntu
synced 2025-06-28 10:01:29 +00:00
Something went wrong with the last commit: restored a single line.
This commit is contained in:
parent
070ce39f96
commit
f4db64b83a
@ -1815,7 +1815,7 @@ class Britney:
|
|||||||
if pkg in conflicts:
|
if pkg in conflicts:
|
||||||
for name, version, op, conflicting in conflicts[pkg]:
|
for name, version, op, conflicting in conflicts[pkg]:
|
||||||
if conflicting in binary_u[PROVIDES] and system[conflicting][1] == [pkg]: continue
|
if conflicting in binary_u[PROVIDES] and system[conflicting][1] == [pkg]: continue
|
||||||
f op == '' and version == '' or check_depends(binary_u[VERSION], op, version):
|
if op == '' and version == '' or check_depends(binary_u[VERSION], op, version):
|
||||||
# if conflict is found, check if it can be solved removing
|
# if conflict is found, check if it can be solved removing
|
||||||
# already-installed packages without broking the system; if
|
# already-installed packages without broking the system; if
|
||||||
# this is not possible, give up and return False
|
# this is not possible, give up and return False
|
||||||
|
Loading…
x
Reference in New Issue
Block a user