Lubuntu/britney2-ubuntu
8
0
Fork 0
mirror of https://git.launchpad.net/~ubuntu-release/britney/+git/britney2-ubuntu synced 2025-05-21 15:31:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed a bunch of minor issues with the output.

Browse Source
This commit is contained in:
Fabio Tranchitella 2006-08-14 11:53:19 +00:00
parent c313a5f644
commit 3c58b798cd
1 changed files with 14 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
britney.py
View File

@ -2027,7 +2027,7 @@ class Britney:
n = l n = l
return packages return packages
def iter_packages(self, packages, hint=False): def iter_packages(self, packages, selected, hint=False):
"""Iter on the list of actions and apply them one-by-one """Iter on the list of actions and apply them one-by-one
This method apply the changes from `packages` to testing, checking the uninstallability This method apply the changes from `packages` to testing, checking the uninstallability
@ -2055,7 +2055,7 @@ class Britney:
compatible = self.options.compatible compatible = self.options.compatible
if not hint: if not hint:
self.output_write("recur: [%s] %s %d/%d\n" % (",".join(self.selected), "", len(packages), len(extra))) self.output_write("recur: [%s] %s %d/%d\n" % (",".join(selected), "", len(packages), len(extra)))
else: lundo = [] else: lundo = []
# loop on the packages (or better, actions) # loop on the packages (or better, actions)
@ -2157,17 +2157,17 @@ class Britney:
# check if the action improved the uninstallability counters # check if the action improved the uninstallability counters
if better: if better:
self.selected.append(pkg) selected.append(pkg)
packages.extend(extra) packages.extend(extra)
extra = [] extra = []
self.output_write("accepted: %s\n" % (pkg)) self.output_write("accepted: %s\n" % (pkg))
self.output_write(" ori: %s\n" % (self.eval_nuninst(self.nuninst_orig))) self.output_write(" ori: %s\n" % (self.eval_nuninst(self.nuninst_orig)))
self.output_write(" pre: %s\n" % (self.eval_nuninst(nuninst_comp))) self.output_write(" pre: %s\n" % (self.eval_nuninst(nuninst_comp)))
self.output_write(" now: %s\n" % (self.eval_nuninst(nuninst))) self.output_write(" now: %s\n" % (self.eval_nuninst(nuninst, nuninst_comp)))
if len(self.selected) <= 20: if len(selected) <= 20:
self.output_write(" all: %s\n" % (" ".join(self.selected))) self.output_write(" all: %s\n" % (" ".join(selected)))
else: else:
self.output_write(" most: (%d) .. %s\n" % (len(self.selected), " ".join(self.selected[-20:]))) self.output_write(" most: (%d) .. %s\n" % (len(selected), " ".join(selected[-20:])))
for k in nuninst: for k in nuninst:
nuninst_comp[k] = nuninst[k] nuninst_comp[k] = nuninst[k]
else: else:
@ -2212,7 +2212,7 @@ class Britney:
if hint: if hint:
return (nuninst_comp, lundo) return (nuninst_comp, lundo)
self.output_write(" finish: [%s]\n" % ",".join(self.selected)) self.output_write(" finish: [%s]\n" % ",".join(selected))
self.output_write("endloop: %s\n" % (self.eval_nuninst(self.nuninst_orig))) self.output_write("endloop: %s\n" % (self.eval_nuninst(self.nuninst_orig)))
self.output_write(" now: %s\n" % (self.eval_nuninst(nuninst_comp))) self.output_write(" now: %s\n" % (self.eval_nuninst(nuninst_comp)))
self.output_write(self.eval_uninst(self.newlyuninst(self.nuninst_orig, nuninst_comp))) self.output_write(self.eval_uninst(self.newlyuninst(self.nuninst_orig, nuninst_comp)))
@ -2233,7 +2233,7 @@ class Britney:
selected = [] selected = []
else: else:
upgrade_me = self.upgrade_me[:] upgrade_me = self.upgrade_me[:]
selected = self.selected[:] selected = self.selected
nuninst_start = self.nuninst_orig nuninst_start = self.nuninst_orig
# these are special parameters for hints processing # these are special parameters for hints processing
@ -2260,14 +2260,14 @@ class Britney:
if earlyabort: if earlyabort:
extra = upgrade_me[:] extra = upgrade_me[:]
(nuninst_end, lundo) = self.iter_packages(init, hint=True) (nuninst_end, lundo) = self.iter_packages(init, selected, hint=True)
self.output_write("easy: %s\n" % (self.eval_nuninst(nuninst_end))) self.output_write("easy: %s\n" % (self.eval_nuninst(nuninst_end)))
self.output_write(self.eval_uninst(self.newlyuninst(nuninst_start, nuninst_end)) + "\n") self.output_write(self.eval_uninst(self.newlyuninst(nuninst_start, nuninst_end)) + "\n")
if not force and not self.is_nuninst_asgood_generous(self.nuninst_orig, nuninst_end): if not force and not self.is_nuninst_asgood_generous(self.nuninst_orig, nuninst_end):
nuninst_end, extra = None, None nuninst_end, extra = None, None
self.selected = selected[:len(init)] self.selected = selected[:len(init)]
else: else:
(nuninst_end, extra) = self.iter_packages(upgrade_me) (nuninst_end, extra) = self.iter_packages(upgrade_me, selected)
if nuninst_end: if nuninst_end:
self.output_write("final: %s\n" % ",".join(sorted(selected))) self.output_write("final: %s\n" % ",".join(sorted(selected)))
@ -2359,7 +2359,10 @@ class Britney:
self.options.break_arches = " ".join([x for x in self.options.break_arches.split() if x != a]) self.options.break_arches = " ".join([x for x in self.options.break_arches.split() if x != a])
self.upgrade_me = archpackages[a] self.upgrade_me = archpackages[a]
self.output_write("info: broken arch run for %s\n" % (a)) self.output_write("info: broken arch run for %s\n" % (a))
tmp = self.selected
self.selected = []
self.do_all() self.do_all()
self.selected = tmp + self.selected
allpackages += self.upgrade_me allpackages += self.upgrade_me
self.options.break_arches = x self.options.break_arches = x
self.upgrade_me = allpackages self.upgrade_me = allpackages