Lubuntu
/
britney2-ubuntu
mirror of https://github.com/lubuntu-team/britney2-ubuntu.git
8
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Small performance improvement: do not copy the list of broken packages over and over, just mark when it is changed.

Browse Source
master
Fabio Tranchitella 18 years ago
parent 3327c07bd9
commit 070ce39f96
1 changed files with 17 additions and 18 deletions
Show Stats Download Patch File Download Diff File

35
britney.py
Unescape View File

@ -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
if op == '' and version == '' or check_depends(binary_u[VERSION], op, version): f 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
@ -2129,14 +2129,14 @@ class Britney:
nuninst[arch] = [x for x in nuninst_comp[arch] if x in binaries[arch][0]] nuninst[arch] = [x for x in nuninst_comp[arch] if x in binaries[arch][0]]
nuninst[arch + "+all"] = [x for x in nuninst_comp[arch + "+all"] if x in binaries[arch][0]] nuninst[arch + "+all"] = [x for x in nuninst_comp[arch + "+all"] if x in binaries[arch][0]]
broken = nuninst[arch + "+all"][:] broken = nuninst[arch + "+all"]
to_check = [x[0] for x in affected if x[1] == arch] to_check = [x[0] for x in affected if x[1] == arch]
# broken packages (first round) # broken packages (first round)
repaired = [] repaired = []
old_broken = None broken_changed = True
last_broken = None last_broken = None
while old_broken != broken: while broken_changed:
old_broken = broken[:] broken_changed = False
for p in to_check: for p in to_check:
if p == last_broken: break if p == last_broken: break
if p not in binaries[arch][0]: continue if p not in binaries[arch][0]: continue
@ -2144,20 +2144,23 @@ class Britney:
if not r and p not in broken: if not r and p not in broken:
last_broken = p last_broken = p
broken.append(p) broken.append(p)
elif r and p in nuninst[arch + "+all"]: broken_changed = True
if not (skip_archall and binaries[arch][0][p][ARCHITECTURE] == 'all'):
nuninst[arch].append(p)
elif r and p in broken:
last_broken = p last_broken = p
repaired.append(p) repaired.append(p)
broken.remove(p) broken.remove(p)
nuninst[arch + "+all"].remove(p) broken_changed = True
if not (skip_archall and binaries[arch][0][p][ARCHITECTURE] == 'all'): if not (skip_archall and binaries[arch][0][p][ARCHITECTURE] == 'all'):
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)
l = 0 l = 0
old_broken = None broken_changed = True
last_broken = None last_broken = None
while old_broken != broken: while broken_changed:
old_broken = broken[:] broken_changed = False
for j in broken + repaired: for j in broken + repaired:
if j not in binaries[arch][0]: continue if j not in binaries[arch][0]: continue
for p in binaries[arch][0][j][RDEPENDS]: for p in binaries[arch][0][j][RDEPENDS]:
@ -2167,22 +2170,18 @@ class Britney:
l = -1 l = -1
last_broken = j last_broken = j
broken.append(p) broken.append(p)
broken_changed = True
if not (skip_archall and binaries[arch][0][p][ARCHITECTURE] == 'all'):
nuninst[arch].append(p)
elif r and p in nuninst[arch + "+all"]: elif r and p in nuninst[arch + "+all"]:
last_broken = p last_broken = p
repaired.append(p) repaired.append(p)
broken.remove(p) broken.remove(p)
nuninst[arch + "+all"].remove(p) broken_changed = True
if not (skip_archall and binaries[arch][0][p][ARCHITECTURE] == 'all'): if not (skip_archall and binaries[arch][0][p][ARCHITECTURE] == 'all'):
nuninst[arch].remove(p) nuninst[arch].remove(p)
if l != -1 and last_broken == j: break if l != -1 and last_broken == j: break
# update the uninstallability counter
for b in broken:
if b not in nuninst[arch + "+all"]:
nuninst[arch + "+all"].append(b)
if b not in nuninst[arch] and not (skip_archall and binaries[arch][0][b][ARCHITECTURE] == 'all'):
nuninst[arch].append(b)
# if we are processing hints, go ahead # if we are processing hints, go ahead
if hint: if hint:
nuninst_comp[arch] = nuninst[arch] nuninst_comp[arch] = nuninst[arch]

Write Preview
Loading…
Cancel
Save