diff options
| author |   Zac Medico <zmedico@gentoo.org> | 2010-03-10 00:31:43 +0000 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2010-03-10 00:31:43 +0000 |
| commit | 6c85fa7fbf9da686c53eb265a133c0032ee964d0 (patch) | |
| tree | 0afbda4d8063b2c69d15e5caf011c3bdf06e497a | |
| parent | Only create implicit libc deps when the version changes. (trunk r15810) (diff) | |
| download | portage-multirepo-2.1.8.3.tar.gz portage-multirepo-2.1.8.3.tar.bz2 portage-multirepo-2.1.8.3.zip | |
Only try to merge portage asap when the new version is different. (trunk r15813)v2.1.8.3
svn path=/main/branches/2.1.7/; revision=15814
| -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 a9b4ca55..8fb1d142 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) |