diff options
| author | Zac Medico <zmedico@gentoo.org> | 2008-04-09 05:31:53 +0000 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2008-04-09 05:31:53 +0000 |
| commit | 4f6b4ce641ee2e33b11c23d1c955c18e906a8a72 (patch) | |
| tree | b0ee7b0d9ab1dfeb7e38bc3629f1bb633c8a7fdb /bin | |
| parent | c4b00468909daab5b1ff48178cfaef6b60a66f02 (diff) | |
| download | portage-4f6b4ce641ee2e33b11c23d1c955c18e906a8a72.tar.gz portage-4f6b4ce641ee2e33b11c23d1c955c18e906a8a72.tar.bz2 portage-4f6b4ce641ee2e33b11c23d1c955c18e906a8a72.zip | |
Handle issues with newlines in elog messages that can trigger an unhandled
ValueError to be raised from a split() call inside collect_ebuild_messages():
* Use \0 to delimit messages, so that that elog messages containing newlines
are handled correctly.
* Handle a potential ValueError when splitting the message type.
(trunk r9763)
svn path=/main/branches/2.1.2/; revision=9764
Diffstat (limited to 'bin')
| -rw-r--r-- | bin/isolated-functions.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/bin/isolated-functions.sh b/bin/isolated-functions.sh index 737c5dfb4..6bd33cb29 100644 --- a/bin/isolated-functions.sh +++ b/bin/isolated-functions.sh @@ -170,7 +170,7 @@ elog_base() { return 1 ;; esac - echo -e "${messagetype} $*" >> "${T}/logging/${EBUILD_PHASE:-other}" + echo -ne "${messagetype} $*\n\0" >> "${T}/logging/${EBUILD_PHASE:-other}" return 0 } |