| 1 |
Don't spawn socks5-server.py for pkg_nofetch, since the spawn_nofetch |
| 2 |
function creates a private PORTAGE_TMPDIR. |
| 3 |
|
| 4 |
X-Gentoo-Bug: 542052 |
| 5 |
X-Gentoo-Bug-URL: https://bugs.gentoo.org/show_bug.cgi?id=542052 |
| 6 |
--- |
| 7 |
pym/portage/package/ebuild/doebuild.py | 4 +++- |
| 8 |
1 file changed, 3 insertions(+), 1 deletion(-) |
| 9 |
|
| 10 |
diff --git a/pym/portage/package/ebuild/doebuild.py b/pym/portage/package/ebuild/doebuild.py |
| 11 |
index a5970d5..94785b5 100644 |
| 12 |
--- a/pym/portage/package/ebuild/doebuild.py |
| 13 |
+++ b/pym/portage/package/ebuild/doebuild.py |
| 14 |
@@ -1497,8 +1497,10 @@ def spawn(mystring, mysettings, debug=False, free=False, droppriv=False, |
| 15 |
keywords['unshare_net'] = not networked |
| 16 |
keywords['unshare_ipc'] = not ipc |
| 17 |
|
| 18 |
- if not networked: |
| 19 |
+ if not networked and mysettings.get("EBUILD_PHASE") != "nofetch": |
| 20 |
# Provide a SOCKS5-over-UNIX-socket proxy to escape sandbox |
| 21 |
+ # Don't do this for pkg_nofetch, since the spawn_nofetch |
| 22 |
+ # function creates a private PORTAGE_TMPDIR. |
| 23 |
try: |
| 24 |
proxy = get_socks5_proxy(mysettings) |
| 25 |
except NotImplementedError: |
| 26 |
-- |
| 27 |
2.0.5 |
Archives