summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorZac Medico <zmedico@gentoo.org>2006-07-08 23:03:37 +0000
committerZac Medico <zmedico@gentoo.org>2006-07-08 23:03:37 +0000
commit0ab656f11fc37f9c1f5a64d98ab03295432e26bf (patch)
tree6a2fc933b0c4dce71c4b7b15c86519207ea9d698
parentfa6929d819ba8a9befd43647ebbdaf5b6ba6e76c (diff)
downloadportage-0ab656f11fc37f9c1f5a64d98ab03295432e26bf.tar.gz
portage-0ab656f11fc37f9c1f5a64d98ab03295432e26bf.tar.bz2
portage-0ab656f11fc37f9c1f5a64d98ab03295432e26bf.zip
Remove the merging=2 case to simplify merge/nomerge logic.
svn path=/main/trunk/; revision=3816
-rwxr-xr-xbin/emerge4
1 files changed, 1 insertions, 3 deletions
diff --git a/bin/emerge b/bin/emerge
index d48290aa0..f606f0680 100755
--- a/bin/emerge
+++ b/bin/emerge
@@ -719,9 +719,7 @@ class depgraph:
iuses.intersection(myuse):
merging=1
- else: # Not addme
- merging=2 # Quick hack to make --onlydeps continue with dep parsing but not merging
- if merging==1:
+ if addme and merging == 1:
mybigkey.append("merge")
else:
mybigkey.append("nomerge")