diff options
Diffstat (limited to 'pym/_emerge')
| -rw-r--r-- | pym/_emerge/EbuildExecuter.py | 3 | ||||
| -rw-r--r-- | pym/_emerge/depgraph.py | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/pym/_emerge/EbuildExecuter.py b/pym/_emerge/EbuildExecuter.py index 4496c757d..90cf401a7 100644 --- a/pym/_emerge/EbuildExecuter.py +++ b/pym/_emerge/EbuildExecuter.py @@ -6,6 +6,7 @@ from _emerge.TaskSequence import TaskSequence from _emerge.CompositeTask import CompositeTask import portage from portage import os +from portage.eapi import eapi_has_src_prepare_and_src_configure class EbuildExecuter(CompositeTask): @@ -72,7 +73,7 @@ class EbuildExecuter(CompositeTask): pkg = self.pkg phases = self._phases eapi = pkg.metadata["EAPI"] - if eapi in ("0", "1"): + if not eapi_has_src_prepare_and_src_configure(eapi): # skip src_prepare and src_configure phases = phases[2:] diff --git a/pym/_emerge/depgraph.py b/pym/_emerge/depgraph.py index cf090d422..7a717df03 100644 --- a/pym/_emerge/depgraph.py +++ b/pym/_emerge/depgraph.py @@ -17,6 +17,7 @@ from portage.const import PORTAGE_PACKAGE_ATOM from portage.dbapi import dbapi from portage.dbapi.dep_expand import dep_expand from portage.dep import Atom +from portage.eapi import eapi_has_strong_blocks from portage.output import bold, blue, colorize, create_color_func, darkblue, \ darkgreen, green, nc_len, red, teal, turquoise, yellow bad = create_color_func("BAD") @@ -3954,7 +3955,7 @@ class depgraph(object): forbid_overlap = False heuristic_overlap = False for blocker in myblocker_uninstalls.parent_nodes(task): - if blocker.eapi in ("0", "1"): + if not eapi_has_strong_blocks(blocker.eapi): heuristic_overlap = True elif blocker.atom.blocker.overlap.forbid: forbid_overlap = True |