diff options
| author | Zac Medico <zmedico@gentoo.org> | 2007-03-06 18:30:06 +0000 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2007-03-06 18:30:06 +0000 |
| commit | 12ff7bbf7bd8fdba6509bd3e72b835a13b058474 (patch) | |
| tree | 80e32fe68b5769137b4681bc49c4d3302ece4199 | |
| parent | 5d257baeea19ba2ddb8c0c8560eaf652099a932a (diff) | |
| download | portage-12ff7bbf7bd8fdba6509bd3e72b835a13b058474.tar.gz portage-12ff7bbf7bd8fdba6509bd3e72b835a13b058474.tar.bz2 portage-12ff7bbf7bd8fdba6509bd3e72b835a13b058474.zip | |
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.
svn path=/main/trunk/; revision=6186
| -rw-r--r-- | pym/emerge/__init__.py | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/pym/emerge/__init__.py b/pym/emerge/__init__.py index 1e2a625a8..663a3a432 100644 --- a/pym/emerge/__init__.py +++ b/pym/emerge/__init__.py @@ -2603,7 +2603,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], @@ -2620,8 +2620,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 |