diff options
Diffstat (limited to 'pym/portage/elog/messages.py')
| -rw-r--r-- | pym/portage/elog/messages.py | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/pym/portage/elog/messages.py b/pym/portage/elog/messages.py index bca63554e..341a61d1f 100644 --- a/pym/portage/elog/messages.py +++ b/pym/portage/elog/messages.py @@ -25,16 +25,24 @@ def collect_ebuild_messages(path): mylogfiles.reverse() logentries = {} for msgfunction in mylogfiles: + filename = os.path.join(path, msgfunction) if msgfunction not in EBUILD_PHASES: - writemsg("!!! can't process invalid log file: %s\n" % f, + writemsg("!!! can't process invalid log file: %s\n" % filename, noiselevel=-1) continue if not msgfunction in logentries: logentries[msgfunction] = [] lastmsgtype = None msgcontent = [] - for l in open(os.path.join(path, msgfunction), "r").readlines(): - msgtype, msg = l.split(" ", 1) + for l in open(filename, "r").read().split("\0"): + if not l: + continue + try: + msgtype, msg = l.split(" ", 1) + except ValueError: + writemsg("!!! malformed entry in " + \ + "log file: '%s'\n" % filename, noiselevel=-1) + continue if lastmsgtype is None: lastmsgtype = msgtype if msgtype == lastmsgtype: |