summaryrefslogtreecommitdiffstats
path: root/pym/_emerge/resolver/output.py
diff options
context:
space:
mode:
Diffstat (limited to 'pym/_emerge/resolver/output.py')
-rw-r--r--pym/_emerge/resolver/output.py3
1 files changed, 2 insertions, 1 deletions
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."))