From 583f01a90ef7d5bd967972e19d4593c0e3e487ea Mon Sep 17 00:00:00 2001 From: Jason Stubbs Date: Sat, 29 Oct 2005 04:25:48 +0000 Subject: Don't add packages to the graph that are left as is due to --upgrade-only. This is necessary because later code assumes that packages are either from porttree or bintree whereas the --upgrade-only is almost exclusively from vartree. svn path=/main/branches/2.0/; revision=2199 --- bin/emerge | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/bin/emerge b/bin/emerge index 6edc87494..1522b57a7 100755 --- a/bin/emerge +++ b/bin/emerge @@ -1317,7 +1317,11 @@ class depgraph: except Exception, e: print "Warning: "+str(e) if cand: - myeb=cand + # --newuse can't work because the installed version isn't available + # just pretend like the package doesn't matter + # XXX: hidden assumption here that the higher versioned package + # satisfies the atom that was given + continue if myeb: myk=["ebuild",myroot,myeb] -- cgit v1.2.3-1-g7c22