diff options
| author |   Zac Medico <zmedico@gentoo.org> | 2008-10-14 21:05:54 +0000 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2008-10-14 21:05:54 +0000 |
| commit | 854b464533619c5684eeed381ab1558a92948e8f (patch) | |
| tree | c12b6bd348ccd8bddfacba94de354d2efe4cb575 /pym/portage/elog | |
| parent | Make sure the pkg_nofetch phase is only called once when in fetchonly mode. (diff) | |
| download | portage-854b464533619c5684eeed381ab1558a92948e8f.tar.gz portage-854b464533619c5684eeed381ab1558a92948e8f.tar.bz2 portage-854b464533619c5684eeed381ab1558a92948e8f.zip | |
When emerge --keep-going bails due to missing dependencies, show the error
message after the mod_echo output since otherwise the mod_echo output can
sweep the error message out of view. Thanks to Donnie Berkholz <dberkholz@g.o>
for reporting.
svn path=/main/trunk/; revision=11690
Diffstat (limited to 'pym/portage/elog')
| -rw-r--r-- | pym/portage/elog/__init__.py | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/pym/portage/elog/__init__.py b/pym/portage/elog/__init__.py index b24c9d9dd..ad5cc873c 100644 --- a/pym/portage/elog/__init__.py +++ b/pym/portage/elog/__init__.py @@ -72,7 +72,13 @@ def elog_process(cpv, mysettings, phasefilter=None): except ImportError: pass - ebuild_logentries = collect_ebuild_messages(os.path.join(mysettings["T"], "logging")) + if "T" in mysettings: + ebuild_logentries = collect_ebuild_messages( + os.path.join(mysettings["T"], "logging")) + else: + # A build dir isn't necessarily required since the messages.e* + # functions allow messages to be generated in-memory. + ebuild_logentries = {} all_logentries = collect_messages() if cpv in all_logentries: all_logentries[cpv] = _merge_logentries(ebuild_logentries, all_logentries[cpv]) |