- s/nice ... time/time nice .../: It doesn't work the other way round.

[packages/rpm-build-tools.git] / builder.sh

diff --git a/builder.sh b/builder.sh
index b322bee8ecc00da9307c0edb52d052c5f1dbc07d..4d8c258d425427e4b33f6e6648730d49e81e805b 100644 (file)
--- a/builder.sh
+++ b/builder.sh
@@ -139,6 +139,7 @@ Usage: builder [-D|--debug] [-V|--version] [-a|--as_anon] [-b|-ba|--build]
                        - setup \$CVSROOT,
        --define <macro> <value>
                        - define a macro <macro> with value <value>,
+       --nodeps        - rpm won't check any dependences
        -g, --get       - get <package>.spec and all related files from
                          CVS repo or HTTP/FTP,
        -h, --help      - this message,
@@ -603,7 +604,9 @@ tag_files()
 
        cd $SOURCE_DIR
        for i in $TAG_FILES; do
-           if [ -f `nourl $i` ]; then
+           # don't tag non cvs files (ie. stored on distfiles)
+           [ "`nourl $i`" != "$i" ] && continue
+           if [ -f "`nourl $i`" ]; then
                if [ "$TAG_VERSION" = "yes" ]; then
                    cvs $OPTIONS $TAGVER `nourl $i`
                fi
@@ -721,7 +724,7 @@ build_package()
            echo "LASTLOG=$LOG" > $LASTLOG_FILE
        fi
        RES_FILE=~/tmp/$RPMBUILD-exit-status.$RANDOM
-       (nice -n ${DEF_NICE_LEVEL} time $RPMBUILD $BUILD_SWITCH -v $QUIET $CLEAN $RPMOPTS $BCOND $SPECFILE; echo $? > $RES_FILE) 2>&1 |tee $LOG
+       (time nice -n ${DEF_NICE_LEVEL} $RPMBUILD $BUILD_SWITCH -v $QUIET $CLEAN $RPMOPTS $BCOND $SPECFILE; echo $? > $RES_FILE) 2>&1 |tee $LOG
        RETVAL=`cat $RES_FILE`
        rm $RES_FILE
        if [ -n "$LOGDIROK" ] && [ -n "$LOGDIRFAIL" ]; then
@@ -886,6 +889,10 @@ while test $# -gt 0 ; do
            shift 2
            RPMOPTS="${RPMOPTS} --define \"${MACRO} ${VALUE}\""
            ;;
+       --nodeps)
+           shift
+           RPMOPTS="${RPMOPTS} --nodeps"
+           ;;
        * )
            SPECFILE="`basename ${1} .spec`.spec"; shift ;;
     esac
@@ -967,6 +974,13 @@ case "$COMMAND" in
                get_files $ICONS
                parse_spec;
            fi
+           # don't fetch sources from remote locations
+           new_SOURCES=""
+           for file in $SOURCES; do
+               [ "`nourl $file`" != "$file" ] && continue
+               new_SOURCES="$new_SOURCES $file"
+           done
+           SOURCES="$new_SOURCES"
            get_files $SOURCES $PATCHES;
            tag_files "$SOURCES $PATCHES $ICONS";
        else