From 0ab656f11fc37f9c1f5a64d98ab03295432e26bf Mon Sep 17 00:00:00 2001 From: Zac Medico Date: Sat, 8 Jul 2006 23:03:37 +0000 Subject: Remove the merging=2 case to simplify merge/nomerge logic. svn path=/main/trunk/; revision=3816 --- bin/emerge | 4 +--- 1 file changed, 1 insertion(+), 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") -- cgit v1.2.3-1-g7c22