diff options
| author | Zac Medico <zmedico@gentoo.org> | 2010-08-17 10:30:12 -0700 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2010-08-17 10:30:12 -0700 |
| commit | 7da58d6836eac167caa5d09f4bad1e194cf8728f (patch) | |
| tree | 716b49b7be354af1b3beeec60a2a8b0ace58c380 | |
| parent | 9a83a8d7a2629e8d5a3d9027ee0e869ac38e66b9 (diff) | |
| download | portage-7da58d6836eac167caa5d09f4bad1e194cf8728f.tar.gz portage-7da58d6836eac167caa5d09f4bad1e194cf8728f.tar.bz2 portage-7da58d6836eac167caa5d09f4bad1e194cf8728f.zip | |
Discard REPLACING_VERSIONS and REPLACED_BY_VERSION when they are no
longer needed.
| -rw-r--r-- | pym/portage/dbapi/vartree.py | 2 | ||||
| -rw-r--r-- | pym/portage/package/ebuild/doebuild.py | 2 |
2 files changed, 4 insertions, 0 deletions
diff --git a/pym/portage/dbapi/vartree.py b/pym/portage/dbapi/vartree.py index 6ec1d5e09..75784a69a 100644 --- a/pym/portage/dbapi/vartree.py +++ b/pym/portage/dbapi/vartree.py @@ -3947,6 +3947,7 @@ class dblink(object): dblnk.settings.backup_changes("REPLACED_BY_VERSION") unmerge_rval = dblnk.unmerge(trimworld=0, ldpath_mtimes=prev_mtimes, others_in_slot=others_in_slot) + dblnk.settings.pop("REPLACED_BY_VERSION", None) if unmerge_rval == os.EX_OK: emerge_log(_(" >>> unmerge success: %s") % (dblnk.mycpv,)) @@ -4479,6 +4480,7 @@ class dblink(object): self, mydbapi, myebuild, "clean") finally: + self.settings.pop('REPLACING_VERSIONS', None) self.vartree.dbapi.linkmap._clear_cache() self.unlockdb() self.vartree.dbapi._bump_mtime(self.mycpv) diff --git a/pym/portage/package/ebuild/doebuild.py b/pym/portage/package/ebuild/doebuild.py index ef340375d..b65425bee 100644 --- a/pym/portage/package/ebuild/doebuild.py +++ b/pym/portage/package/ebuild/doebuild.py @@ -771,6 +771,8 @@ def doebuild(myebuild, mydo, myroot, mysettings, debug=0, listonly=0, if builddir_lock: portage.locks.unlockdir(builddir_lock) + mysettings.pop("REPLACING_VERSIONS", None) + # Make sure that DISTDIR is restored to it's normal value before we return! if "PORTAGE_ACTUAL_DISTDIR" in mysettings: mysettings["DISTDIR"] = mysettings["PORTAGE_ACTUAL_DISTDIR"] |