From de702b9b0baac66d645b0c848b79a259785b5431 Mon Sep 17 00:00:00 2001 From: Zac Medico Date: Sun, 27 Jul 2008 14:07:28 +0000 Subject: Make elog_base() just use \n as the delimiter in the file since it's safe now that lines are always split. svn path=/main/trunk/; revision=11220 --- bin/isolated-functions.sh | 2 +- pym/portage/elog/messages.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/bin/isolated-functions.sh b/bin/isolated-functions.sh index e0d8fb08a..e9ce37cde 100755 --- a/bin/isolated-functions.sh +++ b/bin/isolated-functions.sh @@ -173,7 +173,7 @@ elog_base() { save_IFS IFS=$'\n' for line in $* ; do - echo -ne "${messagetype} ${line}\n\0" >> \ + echo -ne "${messagetype} ${line}\n" >> \ "${T}/logging/${EBUILD_PHASE:-other}" done restore_IFS diff --git a/pym/portage/elog/messages.py b/pym/portage/elog/messages.py index de736664c..2b9f1b337 100644 --- a/pym/portage/elog/messages.py +++ b/pym/portage/elog/messages.py @@ -35,7 +35,7 @@ def collect_ebuild_messages(path): logentries[msgfunction] = [] lastmsgtype = None msgcontent = [] - for l in open(filename, "r").read().split("\0"): + for l in open(filename, "r"): if not l: continue try: -- cgit v1.2.3-1-g7c22