diff options
| author | Zac Medico <zmedico@gentoo.org> | 2007-03-06 18:31:01 +0000 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2007-03-06 18:31:01 +0000 |
| commit | 3c614c4334832de2b4bfcf0c398ddaf11191c7bc (patch) | |
| tree | bf77ea177ecef9a340f4d7430476edf46d6153b0 /bin | |
| parent | 8d5d9379824ef6c7dab60a7e9226225212a7d6d5 (diff) | |
| download | portage-3c614c4334832de2b4bfcf0c398ddaf11191c7bc.tar.gz portage-3c614c4334832de2b4bfcf0c398ddaf11191c7bc.tar.bz2 portage-3c614c4334832de2b4bfcf0c398ddaf11191c7bc.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. (trunk r6185:6186)v2.1.2.2
svn path=/main/branches/2.1.2/; revision=6187
Diffstat (limited to 'bin')
| -rwxr-xr-x | bin/emerge | 5 |
1 files changed, 2 insertions, 3 deletions
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 |