summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJason Stubbs <jstubbs@gentoo.org>2005-12-25 10:58:04 +0000
committerJason Stubbs <jstubbs@gentoo.org>2005-12-25 10:58:04 +0000
commitda77ebf41acde71020defe30351cb0b8c645e4c9 (patch)
tree153372acf23f4c8a3f0c24740303da7765086fa2
parentRemove the now unnecessary USE="*" hack. (diff)
downloadportage-multirepo-da77ebf41acde71020defe30351cb0b8c645e4c9.tar.gz
portage-multirepo-da77ebf41acde71020defe30351cb0b8c645e4c9.tar.bz2
portage-multirepo-da77ebf41acde71020defe30351cb0b8c645e4c9.zip
Don't try to resolve deps of blockers when using --onlydeps.
svn path=/main/trunk/; revision=2470
-rwxr-xr-xbin/emerge19
1 files changed, 9 insertions, 10 deletions
diff --git a/bin/emerge b/bin/emerge
index 66f1d0eb..2c15e146 100755
--- a/bin/emerge
+++ b/bin/emerge
@@ -947,16 +947,15 @@ class depgraph:
# select the correct /var database that we'll be checking against
vardbapi=portage.db[myroot]["vartree"].dbapi
- if addme:
- # if the package is already on the system, we add a "nomerge"
- # directive, otherwise we add a "merge" directive.
- if mytype=="blocks":
- # we've encountered a "blocks" node. We will totally ignore this
- # node and not add it to our digraph if it doesn't apply to us.
- if "--buildpkgonly" not in myopts and myparent and (self.mydbapi[myroot].match(mykey) or vardbapi.match(mykey)):
- mybigkey.append(myparent.split()[2])
- self.digraph.addnode(string.join(mybigkey),myparent)
- return 1
+ # if the package is already on the system, we add a "nomerge"
+ # directive, otherwise we add a "merge" directive.
+ if mytype=="blocks":
+ # we've encountered a "blocks" node. We will totally ignore this
+ # node and not add it to our digraph if it doesn't apply to us.
+ if addme and "--buildpkgonly" not in myopts and myparent and (self.mydbapi[myroot].match(mykey) or vardbapi.match(mykey)):
+ mybigkey.append(myparent.split()[2])
+ self.digraph.addnode(string.join(mybigkey),myparent)
+ return 1
if myuse == None:
self.pkgsettings.setcpv(mykey)