From 5b160087c86917d3f93f4b568392f77c99273dd4 Mon Sep 17 00:00:00 2001 From: Zac Medico Date: Wed, 4 Mar 2009 02:26:24 +0000 Subject: Fix vdb entry writting code in dyn_install() to avoid generating empty entries in some cases. Thanks to Ned Ludd for reporting. svn path=/main/trunk/; revision=12745 --- bin/ebuild.sh | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'bin') diff --git a/bin/ebuild.sh b/bin/ebuild.sh index d4bceae40..dac55a211 100755 --- 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 -- cgit v1.2.3-1-g7c22