Tweak elog message order so python comes first.

diff --git a/pym/portage/elog/__init__.py b/pym/portage/elog/__init__.py
index a26fa57a240db7d41bace04df5c59968f3a2d6b9..090b541b8e42dfdb2083cc767c0f24be23955b42 100644 (file)
--- 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