]> git.pld-linux.org Git - packages/rpm-build-tools.git/commitdiff
builder: set PATH before nice
authorElan Ruusamäe <glen@delfi.ee>
Wed, 1 Aug 2012 16:52:10 +0000 (19:52 +0300)
committerElan Ruusamäe <glen@delfi.ee>
Wed, 1 Aug 2012 16:52:10 +0000 (19:52 +0300)
builder.sh

index 621bc2866c73c91a780cf5134aecea56e8ccac70..343a5524f64e244b35440dccec39734fb43a60fc 100755 (executable)
@@ -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
This page took 0.036814 seconds and 4 git commands to generate.