On Wed,  4 Mar 2015 10:57:27 -0800
Zac Medico <[email protected]> wrote:

> 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
> ---
>  pym/portage/package/ebuild/doebuild.py | 4 +++-
>  1 file changed, 3 insertions(+), 1 deletion(-)
> 
> diff --git a/pym/portage/package/ebuild/doebuild.py
> b/pym/portage/package/ebuild/doebuild.py index a5970d5..94785b5 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:


LGTM ... now for me to finish some things so I can actually get the the
release done...
-- 
Brian Dolbec <dolsen>


Reply via email to