summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorZac Medico <zmedico@gentoo.org>2010-10-02 10:24:07 -0700
committerZac Medico <zmedico@gentoo.org>2010-10-06 15:42:35 -0700
commitaf8f21eb3f550ba090d0f9afc69a3db3c0747364 (patch)
tree8c6ebe95dc0f8cfe3aaab136db5b26442e184fe2
parent959d8a987e45c91caf3696b4acfe25d3289d6e45 (diff)
downloadportage-af8f21eb3f550ba090d0f9afc69a3db3c0747364.tar.gz
portage-af8f21eb3f550ba090d0f9afc69a3db3c0747364.tar.bz2
portage-af8f21eb3f550ba090d0f9afc69a3db3c0747364.zip
Tweak elog message order so python comes first.
-rw-r--r--pym/portage/elog/__init__.py6
1 files changed, 5 insertions, 1 deletions
diff --git a/pym/portage/elog/__init__.py b/pym/portage/elog/__init__.py
index a26fa57a2..090b541b8 100644
--- a/pym/portage/elog/__init__.py
+++ b/pym/portage/elog/__init__.py
@@ -95,7 +95,11 @@ def elog_process(cpv, mysettings, phasefilter=None):
ebuild_logentries = {}
all_logentries = collect_messages()
if cpv in all_logentries:
- all_logentries[cpv] = _merge_logentries(ebuild_logentries, all_logentries[cpv])
+ # Messages generated by the python elog implementation are assumed
+ # to come first. For example, this ensures correct order for einfo
+ # messages that are generated prior to the setup phase.
+ all_logentries[cpv] = \
+ _merge_logentries(all_logentries[cpv], ebuild_logentries)
else:
all_logentries[cpv] = ebuild_logentries