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

diff --git a/bin/emerge b/bin/emerge
index 6edc87494a9c8117242f2967da11433e87bad9fd..1522b57a70026c87b29875c46b5edc99123eb764 100755 (executable)
--- 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]