From 6f2d27ccc84d6999fd7d563711948a729dd18fec Mon Sep 17 00:00:00 2001 From: Zac Medico Date: Mon, 16 Oct 2006 22:47:31 +0000 Subject: 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 --- bin/emerge | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'bin/emerge') 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 -- cgit v1.2.3-1-g7c22