summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--pym/_emerge/__init__.py12
-rw-r--r--pym/portage/dbapi/vartree.py3
2 files changed, 5 insertions, 10 deletions
diff --git a/pym/_emerge/__init__.py b/pym/_emerge/__init__.py
index 773c01d34..597aace59 100644
--- a/pym/_emerge/__init__.py
+++ b/pym/_emerge/__init__.py
@@ -7531,15 +7531,9 @@ class depgraph(object):
not self._opts_no_restart.intersection(self.myopts) and \
pkg.root == self._running_root.root and \
portage.match_from_list(
- portage.const.PORTAGE_PACKAGE_ATOM, [pkg]):
-
- pn, ver, rev = pkg.pv_split
- if rev == "r0":
- myversion = ver
- else:
- myversion = "%s-%s" % (ver, rev)
-
- if myversion != portage.VERSION and "--quiet" not in self.myopts:
+ portage.const.PORTAGE_PACKAGE_ATOM, [pkg]) and \
+ not vardb.cpv_exists(pkg.cpv) and \
+ "--quiet" not in self.myopts:
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."))
diff --git a/pym/portage/dbapi/vartree.py b/pym/portage/dbapi/vartree.py
index 418d87388..569467115 100644
--- a/pym/portage/dbapi/vartree.py
+++ b/pym/portage/dbapi/vartree.py
@@ -3712,7 +3712,8 @@ class dblink(object):
if self.vartree.dbapi._categories is not None:
self.vartree.dbapi._categories = None
if self.myroot == "/" and \
- match_from_list(PORTAGE_PACKAGE_ATOM, [self.mycpv]):
+ match_from_list(PORTAGE_PACKAGE_ATOM, [self.mycpv]) and \
+ not self.vartree.dbapi.cpv_exists(self.mycpv):
settings = self.settings
base_path_orig = os.path.dirname(settings["PORTAGE_BIN_PATH"])
from tempfile import mkdtemp