From 7daac192f408b60b87465874b60c729c237f9fcf Mon Sep 17 00:00:00 2001 From: Zac Medico Date: Sun, 4 May 2008 03:46:52 +0000 Subject: 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 --- bin/emerge | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) (limited to 'bin') diff --git a/bin/emerge b/bin/emerge index 65a582102..c8562d73d 100755 --- 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 -- cgit v1.2.3-1-g7c22