| 1 |
commit: 0950357f5ad30e5c0633ebcd5f417a093ad252b1 |
| 2 |
Author: Michał Górny <mgorny <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sat Jan 27 10:00:16 2018 +0000 |
| 4 |
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sat Jan 27 10:19:47 2018 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/portage.git/commit/?id=0950357f |
| 7 |
|
| 8 |
doebuild: Remove unnecessary restore of PORTAGE_ACTUAL_DISTDIR |
| 9 |
|
| 10 |
Now that the DISTDIR override does not leak to global settings instance, |
| 11 |
there is no need to restore it afterwards. Suggested by Zac Medico. |
| 12 |
|
| 13 |
Reviewed-by: Zac Medico <zmedico <AT> gentoo.org> |
| 14 |
|
| 15 |
pym/portage/package/ebuild/doebuild.py | 5 ----- |
| 16 |
1 file changed, 5 deletions(-) |
| 17 |
|
| 18 |
diff --git a/pym/portage/package/ebuild/doebuild.py b/pym/portage/package/ebuild/doebuild.py |
| 19 |
index c8df9b744..17fc8ccf4 100644 |
| 20 |
--- a/pym/portage/package/ebuild/doebuild.py |
| 21 |
+++ b/pym/portage/package/ebuild/doebuild.py |
| 22 |
@@ -1250,11 +1250,6 @@ def doebuild(myebuild, mydo, _unused=DeprecationWarning, settings=None, debug=0, |
| 23 |
|
| 24 |
mysettings.pop("REPLACING_VERSIONS", None) |
| 25 |
|
| 26 |
- # Make sure that DISTDIR is restored to it's normal value before we return! |
| 27 |
- if "PORTAGE_ACTUAL_DISTDIR" in mysettings: |
| 28 |
- mysettings["DISTDIR"] = mysettings["PORTAGE_ACTUAL_DISTDIR"] |
| 29 |
- del mysettings["PORTAGE_ACTUAL_DISTDIR"] |
| 30 |
- |
| 31 |
if logfile and not returnpid: |
| 32 |
try: |
| 33 |
if os.stat(logfile).st_size == 0: |
Archives