summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-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