Fix package counters in depgraph.display() so they're only incremented

for "ordered" display nodes. (trunk r10157)

svn path=/main/branches/2.1.2/; revision=10158

diff --git a/bin/emerge b/bin/emerge
index 65a5821020b4801c2c8badd11bd12ce9b9cdb8e2..c8562d73d360ac9f1288a738382914c4d4d788e3 100755 (executable)
--- a/bin/emerge
+++ b/bin/emerge
@@ -4373,10 +4373,11 @@ class depgraph(object):
                                installed_versions = vardb.match(portage.cpv_getkey(pkg_key))
                                if vardb.cpv_exists(pkg_key):
                                        addl="  "+yellow("R")+fetch+"  "
-                                       if pkg_merge:
-                                               counters.reinst += 1
-                                       elif pkg_status == "uninstall":
-                                               counters.uninst += 1
+                                       if ordered:
+                                               if pkg_merge:
+                                                       counters.reinst += 1
+                                               elif pkg_status == "uninstall":
+                                                       counters.uninst += 1
                                # filter out old-style virtual matches
                                elif installed_versions and \
                                        portage.cpv_getkey(installed_versions[0]) == \
@@ -4543,7 +4544,8 @@ class depgraph(object):
                                                                if myfetchfile not in myfetchlist:
                                                                        mysize+=myfilesdict[myfetchfile]
                                                                        myfetchlist.append(myfetchfile)
-                                                       counters.totalsize += mysize
+                                                       if ordered:
+                                                               counters.totalsize += mysize
                                                verboseadd+=format_size(mysize)+" "
 
                                        # overlay verbose