diff options
| author | Zac Medico <zmedico@gentoo.org> | 2010-08-17 06:39:17 -0700 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2010-08-17 06:39:17 -0700 |
| commit | 21d2a70b316a7c3b6c9b9a9e81f1d2ab86ba98c7 (patch) | |
| tree | d8ff4a2c24a2166397da66ff59d3b3f9b4dc04c0 /pym/portage/package/ebuild/fetch.py | |
| parent | 71e9c8caf63805b8350c215ee27070d465115eee (diff) | |
| download | portage-21d2a70b316a7c3b6c9b9a9e81f1d2ab86ba98c7.tar.gz portage-21d2a70b316a7c3b6c9b9a9e81f1d2ab86ba98c7.tar.bz2 portage-21d2a70b316a7c3b6c9b9a9e81f1d2ab86ba98c7.zip | |
Unify ebuild spawing some more. All proper ebuild phases which execute
ebuild.sh are spawned via _doebuild_spawn() now. No exceptions.
Diffstat (limited to 'pym/portage/package/ebuild/fetch.py')
| -rw-r--r-- | pym/portage/package/ebuild/fetch.py | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/pym/portage/package/ebuild/fetch.py b/pym/portage/package/ebuild/fetch.py index 0481ed2b0..86d4db96d 100644 --- a/pym/portage/package/ebuild/fetch.py +++ b/pym/portage/package/ebuild/fetch.py @@ -20,7 +20,7 @@ import portage portage.proxy.lazyimport.lazyimport(globals(), 'portage.package.ebuild.config:check_config_instance,config', 'portage.package.ebuild.doebuild:doebuild_environment,' + \ - 'spawn@doebuild_spawn', + '_doebuild_spawn', 'portage.package.ebuild.prepare_build_dirs:prepare_build_dirs', ) @@ -1091,18 +1091,12 @@ def fetch(myuris, mysettings, listonly=0, fetchonly=0, locks_in_subdir=".locks", 2 : sys.stderr.fileno(), } - ebuild_phase = mysettings.get("EBUILD_PHASE") try: - mysettings["EBUILD_PHASE"] = "nofetch" - doebuild_spawn(_shell_quote(EBUILD_SH_BINARY) + \ - " nofetch", mysettings, fd_pipes=fd_pipes) + _doebuild_spawn("nofetch", mysettings, fd_pipes=fd_pipes) finally: - if ebuild_phase is None: - mysettings.pop("EBUILD_PHASE", None) - else: - mysettings["EBUILD_PHASE"] = ebuild_phase if private_tmpdir is not None: shutil.rmtree(private_tmpdir) + private_tmpdir = None elif restrict_fetch: pass |