| 1 |
commit: 79782abdcd91d3ae9f6c3dbd49e8888668581699 |
| 2 |
Author: Zac Medico <zmedico <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Wed Mar 4 18:53:57 2015 +0000 |
| 4 |
Commit: Zac Medico <zmedico <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Wed Mar 4 19:28:55 2015 +0000 |
| 6 |
URL: http://sources.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=79782abd |
| 7 |
|
| 8 |
Don't spawn socks5-server.py for pkg_nofetch (bug 542052) |
| 9 |
|
| 10 |
Don't spawn socks5-server.py for pkg_nofetch, since the spawn_nofetch |
| 11 |
function creates a private PORTAGE_TMPDIR. |
| 12 |
|
| 13 |
X-Gentoo-Bug: 542052 |
| 14 |
X-Gentoo-Bug-URL: https://bugs.gentoo.org/show_bug.cgi?id=542052 |
| 15 |
Acked-by: Brian Dolbec <dolsen <AT> gentoo.org> |
| 16 |
|
| 17 |
pym/portage/package/ebuild/doebuild.py | 4 +++- |
| 18 |
1 file changed, 3 insertions(+), 1 deletion(-) |
| 19 |
|
| 20 |
diff --git a/pym/portage/package/ebuild/doebuild.py b/pym/portage/package/ebuild/doebuild.py |
| 21 |
index a5970d5..94785b5 100644 |
| 22 |
--- a/pym/portage/package/ebuild/doebuild.py |
| 23 |
+++ b/pym/portage/package/ebuild/doebuild.py |
| 24 |
@@ -1497,8 +1497,10 @@ def spawn(mystring, mysettings, debug=False, free=False, droppriv=False, |
| 25 |
keywords['unshare_net'] = not networked |
| 26 |
keywords['unshare_ipc'] = not ipc |
| 27 |
|
| 28 |
- if not networked: |
| 29 |
+ if not networked and mysettings.get("EBUILD_PHASE") != "nofetch": |
| 30 |
# Provide a SOCKS5-over-UNIX-socket proxy to escape sandbox |
| 31 |
+ # Don't do this for pkg_nofetch, since the spawn_nofetch |
| 32 |
+ # function creates a private PORTAGE_TMPDIR. |
| 33 |
try: |
| 34 |
proxy = get_socks5_proxy(mysettings) |
| 35 |
except NotImplementedError: |
Archives