diff options
| author | Zac Medico <zmedico@gentoo.org> | 2011-02-14 07:46:39 -0800 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2011-02-14 08:04:02 -0800 |
| commit | 430a81b039533e8c00da007294a43d99172136a6 (patch) | |
| tree | 1f99400b69a101502e69365b153e7a483eeb1c44 /pym/_emerge | |
| parent | 426d0e6d6832d965f4014299d32a5cbe088d9db0 (diff) | |
| download | portage-430a81b039533e8c00da007294a43d99172136a6.tar.gz portage-430a81b039533e8c00da007294a43d99172136a6.tar.bz2 portage-430a81b039533e8c00da007294a43d99172136a6.zip | |
Recognize git-2.eclass when reinstalling self.
Diffstat (limited to 'pym/_emerge')
| -rw-r--r-- | pym/_emerge/Scheduler.py | 3 | ||||
| -rw-r--r-- | pym/_emerge/depgraph.py | 3 | ||||
| -rw-r--r-- | pym/_emerge/resolver/output.py | 3 |
3 files changed, 6 insertions, 3 deletions
diff --git a/pym/_emerge/Scheduler.py b/pym/_emerge/Scheduler.py index 4ff889396..34e5e6fa0 100644 --- a/pym/_emerge/Scheduler.py +++ b/pym/_emerge/Scheduler.py @@ -931,7 +931,8 @@ class Scheduler(PollScheduler): return True elif pkg.cpv != self._running_portage.cpv or \ '9999' in pkg.cpv or \ - 'git' in pkg.inherited: + 'git' in pkg.inherited or \ + 'git-2' in pkg.inherited: return True return False diff --git a/pym/_emerge/depgraph.py b/pym/_emerge/depgraph.py index f569b1815..271d4bfbd 100644 --- a/pym/_emerge/depgraph.py +++ b/pym/_emerge/depgraph.py @@ -4271,7 +4271,8 @@ class depgraph(object): (running_portage is None or \ running_portage.cpv != replacement_portage.cpv or \ '9999' in replacement_portage.cpv or \ - 'git' in replacement_portage.inherited): + 'git' in replacement_portage.inherited or \ + 'git-2' in replacement_portage.inherited): # update from running_portage to replacement_portage asap asap_nodes.append(replacement_portage) diff --git a/pym/_emerge/resolver/output.py b/pym/_emerge/resolver/output.py index 457b786b1..a5b5e27b7 100644 --- a/pym/_emerge/resolver/output.py +++ b/pym/_emerge/resolver/output.py @@ -732,7 +732,8 @@ def display(depgraph, mylist, favorites=[], verbosity=None): not conf.quiet: if not vardb.cpv_exists(pkg.cpv) or \ '9999' in pkg.cpv or \ - 'git' in pkg.inherited: + 'git' in pkg.inherited or \ + 'git-2' in pkg.inherited: if mylist_index < len(mylist) - 1: p.append(colorize("WARN", "*** Portage will stop merging at this point and reload itself,")) p.append(colorize("WARN", " then resume the merge.")) |