diff options
| author | Zac Medico <zmedico@gentoo.org> | 2006-10-16 22:47:31 +0000 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2006-10-16 22:47:31 +0000 |
| commit | 6f2d27ccc84d6999fd7d563711948a729dd18fec (patch) | |
| tree | e9ccd44dc607f886450e9b6d9725afaa38c0667c | |
| parent | cc792482a3e1517466e3ccb80ae7cadf7e8292fb (diff) | |
| download | portage-6f2d27ccc84d6999fd7d563711948a729dd18fec.tar.gz portage-6f2d27ccc84d6999fd7d563711948a729dd18fec.tar.bz2 portage-6f2d27ccc84d6999fd7d563711948a729dd18fec.zip | |
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
| -rwxr-xr-x | bin/emerge | 4 |
1 files changed, 2 insertions, 2 deletions
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 |