From: Elan Ruusamäe <glen@delfi.ee>
Date: Wed, 1 Aug 2012 16:52:10 +0000 (+0300)
Subject: builder: set PATH before nice
X-Git-Tag: auto/ac/rpm-build-tools-4.5-6~12
X-Git-Url: https://git.pld-linux.org/?a=commitdiff_plain;h=8a0370316c30f0a84062928cf887d074b88dd585;p=packages%2Frpm-build-tools.git

builder: set PATH before nice
---

diff --git a/builder.sh b/builder.sh
index 621bc28..343a552 100755
--- a/builder.sh
+++ b/builder.sh
@@ -1540,7 +1540,7 @@ build_package() {
 		RES_FILE=$(tempfile)
 		local specdir=$(insert_gitlog $SPECFILE)
 
-		(time eval ${NICE_COMMAND} PATH=$CLEAN_PATH $RPMBUILD $TARGET_SWITCH $BUILD_SWITCH -v $QUIET $CLEAN $RPMOPTS $RPMBUILDOPTS $BCOND --define \'_specdir $PACKAGE_DIR\' --define \'_sourcedir $PACKAGE_DIR\' $specdir/$SPECFILE; echo $? > $RES_FILE) 2>&1 |tee $LOG
+		(time eval PATH=$CLEAN_PATH ${NICE_COMMAND} $RPMBUILD $TARGET_SWITCH $BUILD_SWITCH -v $QUIET $CLEAN $RPMOPTS $RPMBUILDOPTS $BCOND --define \'_specdir $PACKAGE_DIR\' --define \'_sourcedir $PACKAGE_DIR\' $specdir/$SPECFILE; echo $? > $RES_FILE) 2>&1 |tee $LOG
 		RETVAL=`cat $RES_FILE`
 		rm -r $RES_FILE $specdir
 		if [ -n "$LOGDIROK" ] && [ -n "$LOGDIRFAIL" ]; then
@@ -1552,7 +1552,7 @@ build_package() {
 		fi
 	else
 		local specdir=$(insert_gitlog $SPECFILE)
-		eval ${NICE_COMMAND} PATH=$CLEAN_PATH $RPMBUILD $TARGET_SWITCH $BUILD_SWITCH -v $QUIET $CLEAN $RPMOPTS $RPMBUILDOPTS $BCOND --define \'_specdir $PACKAGE_DIR\' --define \'_sourcedir $PACKAGE_DIR\' $specdir/$SPECFILE
+		eval PATH=$CLEAN_PATH ${NICE_COMMAND} $RPMBUILD $TARGET_SWITCH $BUILD_SWITCH -v $QUIET $CLEAN $RPMOPTS $RPMBUILDOPTS $BCOND --define \'_specdir $PACKAGE_DIR\' --define \'_sourcedir $PACKAGE_DIR\' $specdir/$SPECFILE
 		RETVAL=$?
 		rm -r $specdir
 	fi