diff options
| author | Zac Medico <zmedico@gentoo.org> | 2006-09-22 09:55:27 +0000 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2006-09-22 09:55:27 +0000 |
| commit | f98d48b871f7edac527f8d8b59bbe6aacaf7a069 (patch) | |
| tree | 890e9d279ae192f60ff2ea4fc47841a243e5f3ba /bin | |
| parent | e976c893db680971bbf4ca67298b5ba34191c5cc (diff) | |
| download | portage-f98d48b871f7edac527f8d8b59bbe6aacaf7a069.tar.gz portage-f98d48b871f7edac527f8d8b59bbe6aacaf7a069.tar.bz2 portage-f98d48b871f7edac527f8d8b59bbe6aacaf7a069.zip | |
Revert r4495, since conversion from nomerge to merge may put the depgraph into an inconsistent state du to USE flag mismatch. This can be solved by checking all args prior to marking packages as nomerge.
svn path=/main/trunk/; revision=4496
Diffstat (limited to 'bin')
| -rwxr-xr-x | bin/emerge | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/bin/emerge b/bin/emerge index a8af02919..afd107080 100755 --- a/bin/emerge +++ b/bin/emerge @@ -717,12 +717,13 @@ class depgraph: return 1 jbigkey = " ".join(mybigkey) + " nomerge" if self.digraph.hasnode(jbigkey): + """XXX: It's possible that this package has been explicitly + requested as a command line argument. This can be solved by + checking all args prior to marking packages as nomerge""" if rev_dep and myparent: self.digraph.addnode(myparent, jbigkey, soft_dep=soft_dep) else: self.digraph.addnode(jbigkey, myparent, soft_dep=soft_dep) - if arg: - self.digraph.replace(jbigkey, " ".join(mybigkey) + " merge") return 1 self.spinner.update() |