From: Zac Medico <zmedico@gentoo.org>
Date: Mon, 16 Oct 2006 22:47:31 +0000 (-0000)
Subject: Always add blockers with priority=digraph.SOFT so that blockers with multiple parents... 
X-Git-Tag: v2.1.2~620
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=6f2d27ccc84d6999fd7d563711948a729dd18fec;p=portage.git

Always add blockers with priority=digraph.SOFT so that blockers with multiple parents can't trigger a circular deps panick.

svn path=/main/trunk/; revision=4731
---

diff --git a/bin/emerge b/bin/emerge
index 073100e04..58dd2348e 100755
--- a/bin/emerge
+++ b/bin/emerge
@@ -734,7 +734,7 @@ class depgraph:
 			if addme and "--buildpkgonly" not in self.myopts and myparent:
 				mybigkey[1] = myparent.split()[1]
 				self.digraph.addnode(" ".join(mybigkey), myparent,
-					priority=priority)
+					priority=digraph.SOFT)
 			return 1
 		if not arg:
 			arg = portage.best_match_to_list(mykey, self.args_keys)
@@ -1478,7 +1478,7 @@ class depgraph:
 			for node in myblockers.root_nodes():
 				retlist.append(node.split())
 				for parent in self.blocker_parents[node]:
-					self.digraph.add(node, parent)
+					self.digraph.add(node, parent, priority=digraph.SOFT)
 
 		return retlist