Remove the merging=2 case to simplify merge/nomerge logic.

svn path=/main/trunk/; revision=3816

diff --git a/bin/emerge b/bin/emerge
index d48290aa01dad918ac058eb44824e6b3275d2210..f606f06801a2dda0a2aca747f8c55cfcb1948531 100755 (executable)
--- 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")