Always add blockers with priority=digraph.SOFT so that blockers with multiple parents...
authorZac Medico <zmedico@gentoo.org>
Mon, 16 Oct 2006 22:47:31 +0000 (22:47 -0000)
committerZac Medico <zmedico@gentoo.org>
Mon, 16 Oct 2006 22:47:31 +0000 (22:47 -0000)
svn path=/main/trunk/; revision=4731

bin/emerge

index 073100e040b97109069ee8b73ad8a5ce693d2147..58dd2348e6ee3ffe994ae6c744df7dded4458ada 100755 (executable)
@@ -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