diff options
| author | Jason Stubbs <jstubbs@gentoo.org> | 2005-10-29 04:25:48 +0000 |
|---|---|---|
| committer | Jason Stubbs <jstubbs@gentoo.org> | 2005-10-29 04:25:48 +0000 |
| commit | 583f01a90ef7d5bd967972e19d4593c0e3e487ea (patch) | |
| tree | ad8dc26774da11c2998ff8612cd2fd0bfb4b2254 /bin/emerge | |
| parent | 0b51b921101a339e6e66fb2991e663e51c5b903e (diff) | |
| download | portage-583f01a90ef7d5bd967972e19d4593c0e3e487ea.tar.gz portage-583f01a90ef7d5bd967972e19d4593c0e3e487ea.tar.bz2 portage-583f01a90ef7d5bd967972e19d4593c0e3e487ea.zip | |
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
Diffstat (limited to 'bin/emerge')
| -rwxr-xr-x | bin/emerge | 6 |
1 files changed, 5 insertions, 1 deletions
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] |