diff options
| author |   Zac Medico <zmedico@gentoo.org> | 2008-05-17 23:27:42 +0000 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2008-05-17 23:27:42 +0000 |
| commit | 55ea662ca697881bd8571a1be89b17a1bfad000b (patch) | |
| tree | 8579f9c4fe4c5c3c81caa5696da0dbeefcdf801c | |
| parent | Add back the "install new portage asap" behavior that got lost when that (diff) | |
| download | portage-55ea662ca697881bd8571a1be89b17a1bfad000b.tar.gz portage-55ea662ca697881bd8571a1be89b17a1bfad000b.tar.bz2 portage-55ea662ca697881bd8571a1be89b17a1bfad000b.zip | |
Fix th logic from the previous commit. (trunk r10350)
svn path=/main/branches/2.1.2/; revision=10355
| -rwxr-xr-x | bin/emerge | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/bin/emerge b/bin/emerge index 24fa6c946..b5589bcef 100755 --- a/bin/emerge +++ b/bin/emerge @@ -3784,13 +3784,16 @@ class depgraph(object): if replacement_portage: replacement_portage = replacement_portage[0] - asap_nodes.append(replacement_portage) else: replacement_portage = None if replacement_portage == running_portage: replacement_portage = None + if replacement_portage is not None: + # update from running_portage to replacement_portage asap + asap_nodes.append(replacement_portage) + if running_portage is not None: try: portage_rdepend = self._select_atoms_highest_available( |