Gentoo Archives: gentoo-portage-dev

From: "Michał Górny" <mgorny@g.o>
To: gentoo-portage-dev@l.g.o
Cc: "Michał Górny" <mgorny@g.o>
Subject: [gentoo-portage-dev] [PATCH v2 2/2] doebuild: Remove unnecessary restore of PORTAGE_ACTUAL_DISTDIR
Date: Sat, 27 Jan 2018 10:02:44
Message-Id: 20180127100230.30199-2-mgorny@gentoo.org
In Reply to: [gentoo-portage-dev] [PATCH v2 1/2] prepare_build_dirs: Fix duplicate override of DISTDIR for 'ebuild' by "Michał Górny"
1 Now that the DISTDIR override does not leak to global settings instance,
2 there is no need to restore it afterwards. Suggested by Zac Medico.
3 ---
4 pym/portage/package/ebuild/doebuild.py | 5 -----
5 1 file changed, 5 deletions(-)
6
7 diff --git a/pym/portage/package/ebuild/doebuild.py b/pym/portage/package/ebuild/doebuild.py
8 index c8df9b744..17fc8ccf4 100644
9 --- a/pym/portage/package/ebuild/doebuild.py
10 +++ b/pym/portage/package/ebuild/doebuild.py
11 @@ -1250,11 +1250,6 @@ def doebuild(myebuild, mydo, _unused=DeprecationWarning, settings=None, debug=0,
12
13 mysettings.pop("REPLACING_VERSIONS", None)
14
15 - # Make sure that DISTDIR is restored to it's normal value before we return!
16 - if "PORTAGE_ACTUAL_DISTDIR" in mysettings:
17 - mysettings["DISTDIR"] = mysettings["PORTAGE_ACTUAL_DISTDIR"]
18 - del mysettings["PORTAGE_ACTUAL_DISTDIR"]
19 -
20 if logfile and not returnpid:
21 try:
22 if os.stat(logfile).st_size == 0:
23 --
24 2.16.1

Replies