| 1 |
Author: zmedico |
| 2 |
Date: 2008-05-04 03:46:52 +0000 (Sun, 04 May 2008) |
| 3 |
New Revision: 10158 |
| 4 |
|
| 5 |
Modified: |
| 6 |
main/branches/2.1.2/bin/emerge |
| 7 |
Log: |
| 8 |
Fix package counters in depgraph.display() so they're only incremented |
| 9 |
for "ordered" display nodes. (trunk r10157) |
| 10 |
|
| 11 |
|
| 12 |
Modified: main/branches/2.1.2/bin/emerge |
| 13 |
=================================================================== |
| 14 |
--- main/branches/2.1.2/bin/emerge 2008-05-04 03:46:19 UTC (rev 10157) |
| 15 |
+++ main/branches/2.1.2/bin/emerge 2008-05-04 03:46:52 UTC (rev 10158) |
| 16 |
@@ -4373,10 +4373,11 @@ |
| 17 |
installed_versions = vardb.match(portage.cpv_getkey(pkg_key)) |
| 18 |
if vardb.cpv_exists(pkg_key): |
| 19 |
addl=" "+yellow("R")+fetch+" " |
| 20 |
- if pkg_merge: |
| 21 |
- counters.reinst += 1 |
| 22 |
- elif pkg_status == "uninstall": |
| 23 |
- counters.uninst += 1 |
| 24 |
+ if ordered: |
| 25 |
+ if pkg_merge: |
| 26 |
+ counters.reinst += 1 |
| 27 |
+ elif pkg_status == "uninstall": |
| 28 |
+ counters.uninst += 1 |
| 29 |
# filter out old-style virtual matches |
| 30 |
elif installed_versions and \ |
| 31 |
portage.cpv_getkey(installed_versions[0]) == \ |
| 32 |
@@ -4543,7 +4544,8 @@ |
| 33 |
if myfetchfile not in myfetchlist: |
| 34 |
mysize+=myfilesdict[myfetchfile] |
| 35 |
myfetchlist.append(myfetchfile) |
| 36 |
- counters.totalsize += mysize |
| 37 |
+ if ordered: |
| 38 |
+ counters.totalsize += mysize |
| 39 |
verboseadd+=format_size(mysize)+" " |
| 40 |
|
| 41 |
# overlay verbose |
| 42 |
|
| 43 |
-- |
| 44 |
gentoo-commits@l.g.o mailing list |
Archives