summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorZac Medico <zmedico@gentoo.org>2011-06-17 13:57:02 -0700
committerZac Medico <zmedico@gentoo.org>2011-06-17 13:57:02 -0700
commit2fde2c69df13932c4ff76f2cd439e4f3de466423 (patch)
tree0522779da7846bfb54862e97c5adf1bb2e40817f
parent8788bb4765821026ca0524985b7b20fd50e618ad (diff)
downloadportage-2fde2c69df13932c4ff76f2cd439e4f3de466423.tar.gz
portage-2fde2c69df13932c4ff76f2cd439e4f3de466423.tar.bz2
portage-2fde2c69df13932c4ff76f2cd439e4f3de466423.zip
treewalk: set REPLACING_VERSIONS later
Settings like this are better done after doebuild_environment, in case doebuild_environment calls config.setcpv/reset. This avoids the need to call backup_changes which is not really intended for per-package settings since it tends to pollute the config instance with settings that survive config.reset() calls.
-rw-r--r--pym/portage/dbapi/vartree.py7
1 files changed, 3 insertions, 4 deletions
diff --git a/pym/portage/dbapi/vartree.py b/pym/portage/dbapi/vartree.py
index 5c6166ca4..eacada6b3 100644
--- a/pym/portage/dbapi/vartree.py
+++ b/pym/portage/dbapi/vartree.py
@@ -3090,10 +3090,6 @@ class dblink(object):
if retval:
return retval
- self.settings["REPLACING_VERSIONS"] = " ".join(
- [portage.versions.cpv_getversion(other.mycpv) for other in others_in_slot] )
- self.settings.backup_changes("REPLACING_VERSIONS")
-
if slot_matches:
# Used by self.isprotected().
max_dblnk = None
@@ -3243,6 +3239,9 @@ class dblink(object):
myebuild = os.path.join(inforoot, self.pkg + ".ebuild")
doebuild_environment(myebuild, "preinst",
settings=self.settings, db=mydbapi)
+ self.settings["REPLACING_VERSIONS"] = " ".join(
+ [portage.versions.cpv_getversion(other.mycpv)
+ for other in others_in_slot])
prepare_build_dirs(settings=self.settings, cleanup=cleanup)
if collisions: