Make fixpackages use a new "#" symbol for /var/db updates (previously '*'

which means 'binary update' was used).

svn path=/main/trunk/; revision=12159

diff --git a/pym/portage/__init__.py b/pym/portage/__init__.py
index c70b77eefa5203d6d6a83c676019c4bdba8132f0..c101635dc1761160ede49a517993ed756204e1bc 100644 (file)
--- 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