diff options
| author | Zac Medico <zmedico@gentoo.org> | 2006-09-22 08:11:31 +0000 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2006-09-22 08:11:31 +0000 |
| commit | 9af77830aec672ebf3f8a86735a9b1c91922e4dd (patch) | |
| tree | 65436915fbf6be0d210cddb6a29c23398765f2d9 /bin | |
| parent | 86d478180e773d76da5610fc3dcbe16eb10eef57 (diff) | |
| download | portage-9af77830aec672ebf3f8a86735a9b1c91922e4dd.tar.gz portage-9af77830aec672ebf3f8a86735a9b1c91922e4dd.tar.bz2 portage-9af77830aec672ebf3f8a86735a9b1c91922e4dd.zip | |
Allow packages specified on the command line to be retroactively upgraded from "nomerge" to "merge" nodes.
svn path=/main/trunk/; revision=4494
Diffstat (limited to 'bin')
| -rwxr-xr-x | bin/emerge | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/bin/emerge b/bin/emerge index 7bf35f190..a8af02919 100755 --- a/bin/emerge +++ b/bin/emerge @@ -721,6 +721,8 @@ class depgraph: 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() |