diff options
Diffstat (limited to 'bin/emerge')
| -rwxr-xr-x | bin/emerge | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/bin/emerge b/bin/emerge index 75258b12b..6e4dae692 100755 --- a/bin/emerge +++ b/bin/emerge @@ -689,9 +689,13 @@ class depgraph: #"no downgrade" emerge """ - jbigkey=string.join(mybigkey) - # Prevent cycles where packages are already in the digraph - if self.digraph.hasnode(jbigkey+" merge") or self.digraph.hasnode(jbigkey+" nomerge"): + jbigkey = " ".join(mybigkey) + " merge" + if self.digraph.hasnode(jbigkey): + if addme: + self.digraph.addnode(jbigkey, myparent) + return 1 + jbigkey = " ".join(mybigkey) + " nomerge" + if self.digraph.hasnode(jbigkey): return 1 self.spinner.update() |