From: Zac Medico <zmedico@gentoo.org>
Date: Tue, 6 Mar 2007 18:31:01 +0000 (-0000)
Subject: For bug #169620, in --tree display always show the dowload size on the node that... 
X-Git-Tag: v2.1.2.2
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=3c614c4334832de2b4bfcf0c398ddaf11191c7bc;p=portage.git

For bug #169620, in --tree display always show the dowload size on the node that is "ordered" rather than one of it's "nomerge" counterparts. (trunk r6185:6186)

svn path=/main/branches/2.1.2/; revision=6187
---

diff --git a/bin/emerge b/bin/emerge
index d499eb7db..3af575601 100755
--- a/bin/emerge
+++ b/bin/emerge
@@ -2600,7 +2600,7 @@ class depgraph:
 				if verbosity == 3:
 					# size verbose
 					mysize=0
-					if x[0] == "ebuild" and x[-1]!="nomerge":
+					if x[0] == "ebuild" and ordered and x[-1] != "nomerge":
 						try:
 							myfilesdict = portdb.getfetchsizes(pkg_key,
 								useflags=self.useFlags[myroot][pkg_key],
@@ -2617,8 +2617,7 @@ class depgraph:
 								if myfetchfile not in myfetchlist:
 									mysize+=myfilesdict[myfetchfile]
 									myfetchlist.append(myfetchfile)
-							if ordered:
-								counters.totalsize += mysize
+							counters.totalsize += mysize
 						verboseadd+=format_size(mysize)+" "
 
 					# overlay verbose