diff options
| author | Zac Medico <zmedico@gentoo.org> | 2008-07-17 03:52:24 +0000 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2008-07-17 03:52:24 +0000 |
| commit | c47a195fc1034f358dea89219ef8e86ba37b422b (patch) | |
| tree | 063f26464d5d0cb6350470edd45863b88966d97a /pym/portage/__init__.py | |
| parent | e21d8a6377b6766e10898d9b19be80af47cc28f9 (diff) | |
| download | portage-c47a195fc1034f358dea89219ef8e86ba37b422b.tar.gz portage-c47a195fc1034f358dea89219ef8e86ba37b422b.tar.bz2 portage-c47a195fc1034f358dea89219ef8e86ba37b422b.zip | |
Eliminate duplicate code by making EbuildProcess inherit from SpawnProcess
instead of SubProcess.
svn path=/main/trunk/; revision=11092
Diffstat (limited to 'pym/portage/__init__.py')
| -rw-r--r-- | pym/portage/__init__.py | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/pym/portage/__init__.py b/pym/portage/__init__.py index 52273bd73..cb21435fd 100644 --- a/pym/portage/__init__.py +++ b/pym/portage/__init__.py @@ -3001,10 +3001,6 @@ def spawn(mystring, mysettings, debug=0, free=0, droppriv=0, sesandbox=0, fakero env=mysettings.environ() keywords["opt_name"]="[%s]" % mysettings["PF"] - if keywords.get("returnpid"): - # emerge handles logging externally - keywords.pop("logfile", None) - fd_pipes = keywords.get("fd_pipes") if fd_pipes is None: fd_pipes = { @@ -5245,8 +5241,12 @@ def doebuild(myebuild, mydo, myroot, mysettings, debug=0, listonly=0, if mystatus: return mystatus have_build_dirs = True - # PORTAGE_LOG_FILE is set above by the prepare_build_dirs() call. - logfile = mysettings.get("PORTAGE_LOG_FILE") + + # emerge handles logging externally + if not returnpid: + # PORTAGE_LOG_FILE is set by the + # above prepare_build_dirs() call. + logfile = mysettings.get("PORTAGE_LOG_FILE") if have_build_dirs: env_file = os.path.join(mysettings["T"], "environment") |