From 605d41153a999b6824f73083a323c4ba283307a9 Mon Sep 17 00:00:00 2001 From: Marius Mauch Date: Sun, 6 Apr 2008 14:20:52 +0000 Subject: preserve order of ebuild messages even between different message types (bug #197905) svn path=/main/trunk/; revision=9726 --- pym/portage/elog/messages.py | 19 +++++++++++++++---- 1 file changed, 15 insertions(+), 4 deletions(-) (limited to 'pym') diff --git a/pym/portage/elog/messages.py b/pym/portage/elog/messages.py index 852b71af9..ed5c8c9dd 100644 --- a/pym/portage/elog/messages.py +++ b/pym/portage/elog/messages.py @@ -24,16 +24,27 @@ def collect_ebuild_messages(path): # exploit listdir() file order so we process log entries in chronological order mylogfiles.reverse() logentries = {} - for f in mylogfiles: - msgfunction, msgtype = f.split(".") + for msgfunction in mylogfiles: if msgfunction not in EBUILD_PHASES: writemsg("!!! can't process invalid log file: %s\n" % f, noiselevel=-1) continue if not msgfunction in logentries: logentries[msgfunction] = [] - msgcontent = open(os.path.join(path, f), "r").readlines() - logentries[msgfunction].append((msgtype, msgcontent)) + lastmsgtype = None + msgcontent = [] + for l in open(os.path.join(path, msgfunction), "r").readlines(): + msgtype, msg = l.split(" ", 1) + if lastmsgtype is None: + lastmsgtype = msgtype + if msgtype == lastmsgtype: + msgcontent.append(msg) + else: + if msgcontent: + logentries[msgfunction].append((lastmsgtype, msgcontent)) + msgcontent = [msg] + lastmsgtype = msgtype + # clean logfiles to avoid repetitions for f in mylogfiles: try: -- cgit v1.2.3-1-g7c22