From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 5B95B1382C5 for ; Sat, 27 Jan 2018 10:20:02 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 77763E093E; Sat, 27 Jan 2018 10:20:00 +0000 (UTC) Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 58898E093E for ; Sat, 27 Jan 2018 10:20:00 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 0C8D2335C31 for ; Sat, 27 Jan 2018 10:19:59 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 867AF1CE for ; Sat, 27 Jan 2018 10:19:57 +0000 (UTC) From: "Michał Górny" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Michał Górny" Message-ID: <1517048387.0950357f5ad30e5c0633ebcd5f417a093ad252b1.mgorny@gentoo> Subject: [gentoo-commits] proj/portage:master commit in: pym/portage/package/ebuild/ X-VCS-Repository: proj/portage X-VCS-Files: pym/portage/package/ebuild/doebuild.py X-VCS-Directories: pym/portage/package/ebuild/ X-VCS-Committer: mgorny X-VCS-Committer-Name: Michał Górny X-VCS-Revision: 0950357f5ad30e5c0633ebcd5f417a093ad252b1 X-VCS-Branch: master Date: Sat, 27 Jan 2018 10:19:57 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 062b71b0-fddf-426e-bf9f-da9fe2f92bdf X-Archives-Hash: ee26c0d7baf237e0419eb04c8be35ff7 commit: 0950357f5ad30e5c0633ebcd5f417a093ad252b1 Author: Michał Górny gentoo org> AuthorDate: Sat Jan 27 10:00:16 2018 +0000 Commit: Michał Górny gentoo 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 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: