- added new --tag-prefix option for name-ver-rel tags prefix

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

diff --git a/builder.sh b/builder.sh
index acf5eb94d8428914be5ce0f2fe20c3f2bf2058e3..1da4830c76273ea31ad5de73db33c942cb6bf8d3 100644 (file)
--- a/builder.sh
+++ b/builder.sh
@@ -51,7 +51,6 @@ LOGDIR=""
 LOGDIROK=""
 LOGDIRFAIL=""
 LASTLOG_FILE=""
-LTAG=""
 CHMOD="no"
 CHMOD_MODE="0444"
 RPMOPTS=""
@@ -109,7 +108,8 @@ Usage: builder [-D|--debug] [-V|--version] [-a|--as_anon] [-b|-ba|--build]
        [-h|--help] [--http] [{-l,--logtofile} <logfile>] [-m|--mr-proper]
        [-q|--quiet] [--date <yyyy-mm-dd> [-r <cvstag>] [{-T--tag <cvstag>]
        [-Tvs|--tag-version-stable] [-Tvn|--tag-version-nest]
-       [-Ts|--tag-stable] [-Tn|--tag-nest] [-Tv|--tag-version]
+       [-Ts|--tag-stable] [-Tn|--tag-nest] [-Tv|--tag-version] 
+       [{-Tp|--tag-prefix} <prefix>]
        [-nu|--no-urls] [-v|--verbose] [--opts <rpm opts>]
        [--with/--without <feature>] [--define <macro> <value>] <package>[.spec]
 
@@ -175,6 +175,8 @@ Usage: builder [-D|--debug] [-V|--version] [-a|--as_anon] [-b|-ba|--build]
                        - add cvs tag NEST for files,
        -Tv, --tag-version
                        - add cvs tag NAME-VERSION-RELESE for files,
+       -Tp, --tag-prefix <prefix>
+                       - add <prefix> to NAME-VERSION-RELEASE tags,
        -v, --verbose   - be verbose,
        -u, --try-upgrade
                        - check version, and try to upgrade package
@@ -479,7 +481,10 @@ get_files()
                            if [ `echo $url | grep -E 'ftp://'` ]; then
                                ${GETURI2} -O "$target" "$url"
                            fi
-                       test -s "$target" || rm -f "$target"
+                       if ! test -s "$target"; then
+                           rm -f "$target"
+                           FROM_DISTFILES=0
+                       fi
                    fi
                elif [ -z "$(src_md5 "$i")" -a "$NOCVS" != "yes" ]; then
                    # ( echo $i | grep -qvE '(ftp|http|https)://' ); -- if CVS should be used, but URLs preferred
@@ -576,7 +581,7 @@ tag_files()
     if [ -n "$1$2$3$4$5$6$7$8$9${10}" ]; then
        echo "Version: $PACKAGE_VERSION"
        echo "Release: $PACKAGE_RELEASE"
-       TAGVER=$PACKAGE_NAME-`echo $PACKAGE_VERSION | sed -e "s/\./\_/g" -e "s/@/#/g"`-`echo $PACKAGE_RELEASE | sed -e "s/\./\_/g" -e "s/@/#/g"`
+       TAGVER=$TAG_PREFIX$PACKAGE_NAME-`echo $PACKAGE_VERSION | sed -e "s/\./\_/g" -e "s/@/#/g"`-`echo $PACKAGE_RELEASE | sed -e "s/\./\_/g" -e "s/@/#/g"`
        if [ "$TAG_VERSION" = "yes" ]; then
            echo "CVS tag: $TAGVER"
        fi
@@ -704,11 +709,6 @@ build_package()
            BUILD_SWITCH="-bs --nodeps" ;;
     esac
     if [ -n "$LOGFILE" ]; then
-       if [ -n "$CVSTAG" ]; then
-           LTAG="r_`echo $CVSTAG|sed -e 's/\./_/g'`_"
-       else
-           LTAG=""
-       fi
        LOG=`eval echo $LOGFILE`
        if [ -n "$LASTLOG_FILE" ]; then
            echo "LASTLOG=$LOG" > $LASTLOG_FILE
@@ -850,6 +850,9 @@ while test $# -gt 0 ; do
            TAG=""
            TAG_VERSION="yes"
            shift;;
+       -Tp | --tag-prefix )
+           TAG_PREFIX="$2"
+           shift 2;;
        -T | --tag )
            COMMAND="tag";
            shift