diff options
| author | Zac Medico <zmedico@gentoo.org> | 2010-11-25 00:23:15 -0800 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2010-11-25 00:47:11 -0800 |
| commit | 0193300ef7846c5600a62c76ea8657d06dc32d5a (patch) | |
| tree | 73c7f017659fd11f00f9ff508a2cf2f43ab66676 | |
| parent | dd434881e805a4b37ebd7f688445e96d4c5f7784 (diff) | |
| download | portage-0193300ef7846c5600a62c76ea8657d06dc32d5a.tar.gz portage-0193300ef7846c5600a62c76ea8657d06dc32d5a.tar.bz2 portage-0193300ef7846c5600a62c76ea8657d06dc32d5a.zip | |
fetch: pass full env to fetcher (for proxy vars)
This should fix bug #315421.
| -rw-r--r-- | pym/portage/package/ebuild/config.py | 2 | ||||
| -rw-r--r-- | pym/portage/package/ebuild/fetch.py | 13 |
2 files changed, 13 insertions, 2 deletions
diff --git a/pym/portage/package/ebuild/config.py b/pym/portage/package/ebuild/config.py index 22570a906..ffe1fe988 100644 --- a/pym/portage/package/ebuild/config.py +++ b/pym/portage/package/ebuild/config.py @@ -2049,7 +2049,7 @@ class config(object): eapi = self.get('EAPI') phase = self.get('EBUILD_PHASE') filter_calling_env = False - if phase not in ('clean', 'cleanrm', 'depend'): + if phase not in ('clean', 'cleanrm', 'depend', 'fetch'): temp_dir = self.get('T') if temp_dir is not None and \ os.path.exists(os.path.join(temp_dir, 'environment')): diff --git a/pym/portage/package/ebuild/fetch.py b/pym/portage/package/ebuild/fetch.py index 2c7f00703..f97707fd6 100644 --- a/pym/portage/package/ebuild/fetch.py +++ b/pym/portage/package/ebuild/fetch.py @@ -81,7 +81,18 @@ def _spawn_fetch(settings, args, **kwargs): if args[0] != BASH_BINARY: args = [BASH_BINARY, "-c", "exec \"$@\"", args[0]] + args - rval = spawn_func(args, env=settings.environ(), **kwargs) + # Ensure that EBUILD_PHASE is set to fetch, so that config.environ() + # does not filter the calling environment (which may contain needed + # proxy variables, as in bug #315421). + phase_backup = settings.get('EBUILD_PHASE') + settings['EBUILD_PHASE'] = 'fetch' + try: + rval = spawn_func(args, env=settings.environ(), **kwargs) + finally: + if phase_backup is None: + settings.pop('EBUILD_PHASE', None) + else: + settings['EBUILD_PHASE'] = phase_backup return rval |