diff options
| author | Zac Medico <zmedico@gentoo.org> | 2008-05-04 03:46:19 +0000 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2008-05-04 03:46:19 +0000 |
| commit | 1efafabc3d3f6983c5315343d5afa9c31a8f5acc (patch) | |
| tree | adda7146ab3fb613096b80dab11eca57ebe69a89 /pym | |
| parent | e2119019e2cba0f7f8fc6023d7cfeaf8bc210111 (diff) | |
| download | portage-1efafabc3d3f6983c5315343d5afa9c31a8f5acc.tar.gz portage-1efafabc3d3f6983c5315343d5afa9c31a8f5acc.tar.bz2 portage-1efafabc3d3f6983c5315343d5afa9c31a8f5acc.zip | |
Fix package counters in depgraph.display() so they're only incremented
for "ordered" display nodes.
svn path=/main/trunk/; revision=10157
Diffstat (limited to 'pym')
| -rw-r--r-- | pym/_emerge/__init__.py | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/pym/_emerge/__init__.py b/pym/_emerge/__init__.py index 40960ab1a..adfc332d8 100644 --- a/pym/_emerge/__init__.py +++ b/pym/_emerge/__init__.py @@ -4221,10 +4221,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]) == \ @@ -4391,7 +4392,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 |