Re: [gentoo-portage-dev] [PATCH v2 2/2] doebuild: Remove unnecessary restore of PORTAGE_ACTUAL_DISTDIR

[Zac Medico]

On 01/27/2018 02:02 AM, Michał Górny wrote:
> Now that the DISTDIR override does not leak to global settings instance,
> there is no need to restore it afterwards. Suggested by Zac Medico.
> ---
>  pym/portage/package/ebuild/doebuild.py | 5 -
>  1 file changed, 5 deletions(-)

Both patches look good. Please merge.
-- 
Thanks,
Zac



signature.asc
Description: OpenPGP digital signature

[gentoo-portage-dev] [PATCH v2 2/2] doebuild: Remove unnecessary restore of PORTAGE_ACTUAL_DISTDIR

[Michał Górny]

Now that the DISTDIR override does not leak to global settings instance,
there is no need to restore it afterwards. Suggested by Zac Medico.
---
 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:
-- 
2.16.1