diff options
| author | Zac Medico <zmedico@gentoo.org> | 2006-10-20 05:44:01 +0000 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2006-10-20 05:44:01 +0000 |
| commit | d9c27ecdb11abe8a36caa60c70b915f00e24d342 (patch) | |
| tree | efa56b1146f6017df9fe640eb796d01dc02482d7 | |
| parent | bc419636d00e8ff7ce5acb08b5320fe41f8d29c8 (diff) | |
| download | portage-d9c27ecdb11abe8a36caa60c70b915f00e24d342.tar.gz portage-d9c27ecdb11abe8a36caa60c70b915f00e24d342.tar.bz2 portage-d9c27ecdb11abe8a36caa60c70b915f00e24d342.zip | |
Remove special case of --emptytree in depgraph.display(). Thanks to Jason Stubbs for this patch from bug #152030.
svn path=/main/trunk/; revision=4761
| -rwxr-xr-x | bin/emerge | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/bin/emerge b/bin/emerge index 83ac67baf..0f8b996f0 100755 --- a/bin/emerge +++ b/bin/emerge @@ -1845,11 +1845,9 @@ class depgraph: #we need to use "--emptrytree" testing here rather than "empty" param testing because "empty" #param is used for -u, where you still *do* want to see when something is being upgraded. myoldbest="" - if "--emptytree" not in self.myopts and \ - self.trees[x[1]]["vartree"].exists_specific(x[2]): + if self.trees[x[1]]["vartree"].exists_specific(pkg_key): addl=" "+yellow("R")+fetch+" " - elif "--emptytree" not in self.myopts and \ - self.trees[x[1]]["vartree"].exists_specific_cat(x[2]): + elif self.trees[x[1]]["vartree"].exists_specific_cat(pkg_key): mynewslot = mydbapi.aux_get(pkg_key, ["SLOT"])[0] myoldlist = self.trees[x[1]]["vartree"].dbapi.match( portage.pkgsplit(x[2])[0]) |