From 61b870e0f2d3c1193ed0342ef787726751ea3b1e Mon Sep 17 00:00:00 2001 From: Zac Medico Date: Mon, 19 Oct 2009 03:38:22 +0000 Subject: [PATCH] Fix messages broken in r14616. Thanks to Arfrever for reporting and thanks to Jonathan Callen for this patch. (trunk r14675) svn path=/main/branches/2.1.7/; revision=14688 --- bin/ebuild.sh | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/bin/ebuild.sh b/bin/ebuild.sh index 14a311c61..1b83620b4 100755 --- a/bin/ebuild.sh +++ b/bin/ebuild.sh @@ -915,7 +915,7 @@ dyn_prepare() { [ -n "$EBUILD_PHASE" ] && rm -f "$T/logging/$EBUILD_PHASE" ebuild_phase pre_src_prepare - vecho ">>> Preparing source in $srcdir ..." + vecho ">>> Preparing source in $PWD ..." ebuild_phase src_prepare touch "$PORTAGE_BUILDDIR"/.prepared vecho ">>> Source prepared." @@ -947,7 +947,7 @@ dyn_configure() { [ -n "$EBUILD_PHASE" ] && rm -f "$T/logging/$EBUILD_PHASE" ebuild_phase pre_src_configure - vecho ">>> Configuring source in $srcdir ..." + vecho ">>> Configuring source in $PWD ..." ebuild_phase src_configure touch "$PORTAGE_BUILDDIR"/.configured vecho ">>> Source configured." @@ -980,7 +980,7 @@ dyn_compile() { [ -n "$EBUILD_PHASE" ] && rm -f "$T/logging/$EBUILD_PHASE" ebuild_phase pre_src_compile - vecho ">>> Compiling source in ${srcdir} ..." + vecho ">>> Compiling source in $PWD ..." ebuild_phase src_compile touch "$PORTAGE_BUILDDIR"/.compiled vecho ">>> Source compiled." @@ -1042,7 +1042,6 @@ dyn_install() { ebuild_phase pre_src_install rm -rf "${PORTAGE_BUILDDIR}/image" mkdir "${PORTAGE_BUILDDIR}/image" - local srcdir if [[ -d $S ]] ; then cd "${S}" elif hasq $EAPI 0 1 2; then -- 2.26.2