commit: 0950357f5ad30e5c0633ebcd5f417a093ad252b1
Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Sat Jan 27 10:00:16 2018 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sat Jan 27 10:19:47 2018 +0000
URL: https://gitweb.gentoo.org/proj/portage.git/commit/?id=0950357f
doebuild: Remove unnecessary restore of PORTAGE_ACTUAL_DISTDIR
Now that the DISTDIR override does not leak to global settings instance,
there is no need to restore it afterwards. Suggested by Zac Medico.
Reviewed-by: Zac Medico <zmedico <AT> gentoo.org>
pym/portage/package/ebuild/doebuild.py | 5 -----
1 file changed, 5 deletions(-)
diff --git a/pym/portage/package/ebuild/doebuild.py
b/pym/portage/package/ebuild/doebuild.py
index c8df9b744..17fc8ccf4 100644
--- a/pym/portage/package/ebuild/doebuild.py
+++ b/pym/portage/package/ebuild/doebuild.py
@@ -1250,11 +1250,6 @@ def doebuild(myebuild, mydo, _unused=DeprecationWarning,
settings=None, debug=0,
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"]
- del mysettings["PORTAGE_ACTUAL_DISTDIR"]
-
if logfile and not returnpid:
try:
if os.stat(logfile).st_size == 0:
