summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJason Stubbs <jstubbs@gentoo.org>2005-12-17 05:59:16 +0000
committerJason Stubbs <jstubbs@gentoo.org>2005-12-17 05:59:16 +0000
commit9f8ddbf6c0fd20d5fd1d8fe6dfd530af9c867c71 (patch)
tree507d23c8c5b774f93dca747aea7a157a396418a7 /bin/emerge
parentRemove duplicate if statement. (diff)
downloadportage-multirepo-9f8ddbf6c0fd20d5fd1d8fe6dfd530af9c867c71.tar.gz
portage-multirepo-9f8ddbf6c0fd20d5fd1d8fe6dfd530af9c867c71.tar.bz2
portage-multirepo-9f8ddbf6c0fd20d5fd1d8fe6dfd530af9c867c71.zip
Check if atoms with matching keys will result in higher versioned packages
when dealing with || ( ) type dependencies. #100876 svn path=/main/trunk/; revision=2389
Diffstat (limited to 'bin/emerge')
-rwxr-xr-xbin/emerge3
1 files changed, 1 insertions, 2 deletions
diff --git a/bin/emerge b/bin/emerge
index b4474bb0..4ce5130e 100755
--- a/bin/emerge
+++ b/bin/emerge
@@ -1188,8 +1188,7 @@ class depgraph:
print "Depstring:",depstring
if not arg:
#processing dependencies
- mycheck=portage.dep_check(depstring,self.mydbapi[myroot],self.pkgsettings,myuse=myuse,use_binaries=("--usepkg" in myopts))
- #mycheck=portage.dep_check(depstring,self.mydbapi[myroot],self.pkgsettings,myuse=myuse)
+ mycheck=portage.dep_check(depstring,self.mydbapi[myroot],self.pkgsettings,myuse=myuse,use_binaries=("--usepkgonly" in myopts),myroot=myroot)
if not mycheck[0]:
mymerge=[]