Fix vdb entry writting code in dyn_install() to avoid generating empty entries

in some cases. Thanks to Ned Ludd <solar@g.o> for reporting.

svn path=/main/trunk/; revision=12745

diff --git a/bin/ebuild.sh b/bin/ebuild.sh
index d4bceae4069d58e829e541d6929c59c9ef1ee6f3..dac55a2116e81c9af7158d0147bf251611db008f 100755 (executable)
--- a/bin/ebuild.sh
+++ b/bin/ebuild.sh
@@ -1003,14 +1003,15 @@ dyn_install() {
 
        cd "${PORTAGE_BUILDDIR}"/build-info
        set -f
-       local f
+       local f x
+       IFS=$' \t\n\r'
        for f in ASFLAGS CATEGORY CBUILD CC CFLAGS CHOST CTARGET CXX \
                CXXFLAGS DEPEND EXTRA_ECONF EXTRA_EINSTALL EXTRA_MAKE \
                FEATURES INHERITED IUSE LDFLAGS LIBCFLAGS LIBCXXFLAGS \
                LICENSE PDEPEND PF PKGUSE PROPERTIES PROVIDE RDEPEND RESTRICT SLOT \
                KEYWORDS HOMEPAGE SRC_URI DESCRIPTION; do
-               [ -n "${!f}" ] && echo $(echo "${!f}" | \
-                       tr '\n,\r,\t' ' , , ' | sed s/'  \+'/' '/g) > ${f}
+               x=$(echo -n ${!f})
+               [[ -n $x ]] && echo "$x" > $f
        done
        echo "${USE}"       > USE
        echo "${EAPI:-0}"   > EAPI