From: Zac Medico <zmedico@gentoo.org>
Date: Sat, 2 Oct 2010 17:24:07 +0000 (-0700)
Subject: Tweak elog message order so python comes first.
X-Git-Tag: v2.1.9.14~38
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=af8f21eb3f550ba090d0f9afc69a3db3c0747364;p=portage.git

Tweak elog message order so python comes first.
---

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