diff options
| author |   Michał Górny <mgorny@gentoo.org> | 2018-01-27 11:00:16 +0100 |
|---|---|---|
| committer | Michał Górny <mgorny@gentoo.org> | 2018-01-27 11:19:47 +0100 |
| commit | 0950357f5ad30e5c0633ebcd5f417a093ad252b1 (patch) | |
| tree | 477288fe0f17dcb78d44b73a3e180b2cb54005d1 | |
| parent | prepare_build_dirs: Fix duplicate override of DISTDIR for 'ebuild' (diff) | |
| download | portage-0950357f5ad30e5c0633ebcd5f417a093ad252b1.tar.gz portage-0950357f5ad30e5c0633ebcd5f417a093ad252b1.tar.bz2 portage-0950357f5ad30e5c0633ebcd5f417a093ad252b1.zip | |
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@gentoo.org>
| -rw-r--r-- | pym/portage/package/ebuild/doebuild.py | 5 |
1 files changed, 0 insertions, 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: |