diff options
| author | Zac Medico <zmedico@gentoo.org> | 2008-05-04 03:46:52 +0000 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2008-05-04 03:46:52 +0000 |
| commit | 7daac192f408b60b87465874b60c729c237f9fcf (patch) | |
| tree | e329fe3109b38ed44afb2ae8440cf950740f84f8 /bin/emerge | |
| parent | ff984554d2046dedc1e12a616c479b6284161db2 (diff) | |
| download | portage-7daac192f408b60b87465874b60c729c237f9fcf.tar.gz portage-7daac192f408b60b87465874b60c729c237f9fcf.tar.bz2 portage-7daac192f408b60b87465874b60c729c237f9fcf.zip | |
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
Diffstat (limited to 'bin/emerge')
| -rwxr-xr-x | bin/emerge | 12 |
1 files changed, 7 insertions, 5 deletions
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 |