commit 8a0370316c30f0a84062928cf887d074b88dd585
Author: Elan Ruusamäe <[email protected]>
Date: Wed Aug 1 19:52:10 2012 +0300
builder: set PATH before nice
builder.sh | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
---
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
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
