summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZac Medico <zmedico@gentoo.org>2008-12-05 00:08:58 +0000
committerZac Medico <zmedico@gentoo.org>2008-12-05 00:08:58 +0000
commit1ee56423dc7ec88f4969598d45534fcb5255c5be (patch)
treef38dea0eed472e9bab6cb6e8a3aa2efbd37d9e14
parentMake fixpackages less noisy by only generting '*' characters for packages (diff)
downloadportage-2.2_rc17.tar.gz
portage-2.2_rc17.tar.bz2
portage-2.2_rc17.zip
Make fixpackages use a new "#" symbol for /var/db updates (previously '*'v2.2_rc17
which means 'binary update' was used). svn path=/main/trunk/; revision=12159
-rw-r--r--pym/portage/__init__.py13
1 files changed, 11 insertions, 2 deletions
diff --git a/pym/portage/__init__.py b/pym/portage/__init__.py
index c70b77eef..c101635dc 100644
--- a/pym/portage/__init__.py
+++ b/pym/portage/__init__.py
@@ -7308,7 +7308,13 @@ def _global_updates(trees, prev_mtimes):
writemsg_stdout("\n\n")
writemsg_stdout(green("Performing Global Updates: ")+bold(mykey)+"\n")
writemsg_stdout("(Could take a couple of minutes if you have a lot of binary packages.)\n")
- writemsg_stdout(" "+bold(".")+"='update pass' "+bold("*")+"='binary update' "+bold("@")+"='/var/db move'\n"+" "+bold("s")+"='/var/db SLOT move' "+bold("%")+"='binary move' "+bold("S")+"='binary SLOT move'\n "+bold("p")+"='update /etc/portage/package.*'\n")
+ writemsg_stdout(" " + bold(".") + "='update pass' " + \
+ bold("*") + "='binary update' " + bold("#") + \
+ "='/var/db update' " + bold("@") + "='/var/db move'\n" + \
+ " " + bold("s") + "='/var/db SLOT move' " + \
+ bold("%") + "='binary move' " + bold("S") + \
+ "='binary SLOT move'\n " + \
+ bold("p") + "='update /etc/portage/package.*'\n")
valid_updates, errors = parse_updates(mycontent)
myupd.extend(valid_updates)
writemsg_stdout(len(valid_updates) * "." + "\n")
@@ -7378,9 +7384,12 @@ def _global_updates(trees, prev_mtimes):
"fixpackages" in mysettings.features:
def onUpdate(maxval, curval):
if curval > 0:
- writemsg_stdout("*")
+ writemsg_stdout("#")
vardb.update_ents(myupd, onUpdate=onUpdate)
if bindb:
+ def onUpdate(maxval, curval):
+ if curval > 0:
+ writemsg_stdout("*")
bindb.update_ents(myupd, onUpdate=onUpdate)
else:
do_upgrade_packagesmessage = 1