diff options
| author |   Zac Medico <zmedico@gentoo.org> | 2008-12-05 00:09:54 +0000 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2008-12-05 00:09:54 +0000 |
| commit | 56e3c19c4d9ae64b62688ad7973eb1572bc95ea4 (patch) | |
| tree | f70ad4e2029f522abc873492eda228eb4355eeb3 | |
| parent | Make fixpackages less noisy by only generting '*' characters for packages (diff) | |
| download | portage-multirepo-56e3c19c4d9ae64b62688ad7973eb1572bc95ea4.tar.gz portage-multirepo-56e3c19c4d9ae64b62688ad7973eb1572bc95ea4.tar.bz2 portage-multirepo-56e3c19c4d9ae64b62688ad7973eb1572bc95ea4.zip | |
Make fixpackages use a new "#" symbol for /var/db updates (previously '*'v2.1.6_rc3
which means 'binary update' was used). (trunk r12159)
svn path=/main/branches/2.1.6/; revision=12160
| -rw-r--r-- | pym/portage/__init__.py | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/pym/portage/__init__.py b/pym/portage/__init__.py index e99fe2ce..70f4423d 100644 --- a/pym/portage/__init__.py +++ b/pym/portage/__init__.py @@ -7295,7 +7295,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") @@ -7365,9 +7371,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 |