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

diff --git a/bin/isolated-functions.sh b/bin/isolated-functions.sh
index e0d8fb08aae6f20e28abaa02abb326820854d409..e9ce37cdea7cdba32f9e97041eb2bb059a4ff8d3 100755 (executable)
--- 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 de736664cd95ae44ae842b32d55fbe4f528e8a3c..2b9f1b33794fc5b225de34df6e2dedfa32d26d18 100644 (file)
--- 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: