From: Zac Medico Date: Fri, 20 Oct 2006 05:44:01 +0000 (-0000) Subject: Remove special case of --emptytree in depgraph.display(). Thanks to Jason Stubbs... X-Git-Tag: v2.1.2~596 X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=d9c27ecdb11abe8a36caa60c70b915f00e24d342;p=portage.git Remove special case of --emptytree in depgraph.display(). Thanks to Jason Stubbs for this patch from bug #152030. svn path=/main/trunk/; revision=4761 --- 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])