diff options
| author | Zac Medico <zmedico@gentoo.org> | 2010-03-10 00:29:24 +0000 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2010-03-10 00:29:24 +0000 |
| commit | 63ab485cd530dcdaf7472dfd5b69a44dae1ebd82 (patch) | |
| tree | bb74f328bacc9fa8c49f45924e22ae06a47e11bc /pym/_emerge | |
| parent | e3ab573fa40ce847203545ba87b0ffea7f7d1a04 (diff) | |
| download | portage-63ab485cd530dcdaf7472dfd5b69a44dae1ebd82.tar.gz portage-63ab485cd530dcdaf7472dfd5b69a44dae1ebd82.tar.bz2 portage-63ab485cd530dcdaf7472dfd5b69a44dae1ebd82.zip | |
Only try to merge portage asap when the new version is different.v2.2_rc67
svn path=/main/trunk/; revision=15813
Diffstat (limited to 'pym/_emerge')
| -rw-r--r-- | pym/_emerge/depgraph.py | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/pym/_emerge/depgraph.py b/pym/_emerge/depgraph.py index aa737b3b5..2470e6a0d 100644 --- a/pym/_emerge/depgraph.py +++ b/pym/_emerge/depgraph.py @@ -3341,7 +3341,9 @@ class depgraph(object): if replacement_portage == running_portage: replacement_portage = None - if replacement_portage is not None: + if replacement_portage is not None and \ + (running_portage is None or \ + (running_portage.cpv != replacement_portage.cpv)): # update from running_portage to replacement_portage asap asap_nodes.append(replacement_portage) |