1 |
On Wed, 4 Mar 2015 10:57:27 -0800 |
2 |
Zac Medico <zmedico@g.o> wrote: |
3 |
|
4 |
> Don't spawn socks5-server.py for pkg_nofetch, since the spawn_nofetch |
5 |
> function creates a private PORTAGE_TMPDIR. |
6 |
> |
7 |
> X-Gentoo-Bug: 542052 |
8 |
> X-Gentoo-Bug-URL: https://bugs.gentoo.org/show_bug.cgi?id=542052 |
9 |
> --- |
10 |
> pym/portage/package/ebuild/doebuild.py | 4 +++- |
11 |
> 1 file changed, 3 insertions(+), 1 deletion(-) |
12 |
> |
13 |
> diff --git a/pym/portage/package/ebuild/doebuild.py |
14 |
> b/pym/portage/package/ebuild/doebuild.py index a5970d5..94785b5 100644 |
15 |
> --- a/pym/portage/package/ebuild/doebuild.py |
16 |
> +++ b/pym/portage/package/ebuild/doebuild.py |
17 |
> @@ -1497,8 +1497,10 @@ def spawn(mystring, mysettings, debug=False, |
18 |
> free=False, droppriv=False, keywords['unshare_net'] = not networked |
19 |
> keywords['unshare_ipc'] = not ipc |
20 |
> |
21 |
> - if not networked: |
22 |
> + if not networked and |
23 |
> mysettings.get("EBUILD_PHASE") != "nofetch": # Provide a |
24 |
> SOCKS5-over-UNIX-socket proxy to escape sandbox |
25 |
> + # Don't do this for pkg_nofetch, since the |
26 |
> spawn_nofetch |
27 |
> + # function creates a private PORTAGE_TMPDIR. |
28 |
> try: |
29 |
> proxy = get_socks5_proxy(mysettings) |
30 |
> except NotImplementedError: |
31 |
|
32 |
|
33 |
LGTM ... now for me to finish some things so I can actually get the the |
34 |
release done... |
35 |
-- |
36 |
Brian Dolbec <dolsen> |