aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZac Medico <zmedico@gentoo.org>2015-03-04 10:53:57 -0800
committerZac Medico <zmedico@gentoo.org>2015-03-04 11:28:55 -0800
commit79782abdcd91d3ae9f6c3dbd49e8888668581699 (patch)
treec1410d9c933b27a4235f106ff2fce1dc976c3d0d
parentdepgraph: fix 'operation' AttributeError (bug 541754) (diff)
downloadportage-79782abdcd91d3ae9f6c3dbd49e8888668581699.tar.gz
portage-79782abdcd91d3ae9f6c3dbd49e8888668581699.tar.bz2
portage-79782abdcd91d3ae9f6c3dbd49e8888668581699.zip
Don't spawn socks5-server.py for pkg_nofetch (bug 542052)
Don't spawn socks5-server.py for pkg_nofetch, since the spawn_nofetch function creates a private PORTAGE_TMPDIR. X-Gentoo-Bug: 542052 X-Gentoo-Bug-URL: https://bugs.gentoo.org/show_bug.cgi?id=542052 Acked-by: Brian Dolbec <dolsen@gentoo.org>
-rw-r--r--pym/portage/package/ebuild/doebuild.py4
1 files changed, 3 insertions, 1 deletions
diff --git a/pym/portage/package/ebuild/doebuild.py b/pym/portage/package/ebuild/doebuild.py
index a5970d5ec..94785b505 100644
--- a/pym/portage/package/ebuild/doebuild.py
+++ b/pym/portage/package/ebuild/doebuild.py
@@ -1497,8 +1497,10 @@ def spawn(mystring, mysettings, debug=False, free=False, droppriv=False,
keywords['unshare_net'] = not networked
keywords['unshare_ipc'] = not ipc
- if not networked:
+ if not networked and mysettings.get("EBUILD_PHASE") != "nofetch":
# Provide a SOCKS5-over-UNIX-socket proxy to escape sandbox
+ # Don't do this for pkg_nofetch, since the spawn_nofetch
+ # function creates a private PORTAGE_TMPDIR.
try:
proxy = get_socks5_proxy(mysettings)
except NotImplementedError: