Allow to rebuild tag only with explicit -r option

diff --git a/builder.sh b/builder.sh
index 1c096b891a13e0ea8d8dc1777e8e898de425aec8..512e5077c57b1fe752a9a036bddea2fb4514189c 100755 (executable)
--- a/builder.sh
+++ b/builder.sh
@@ -2476,9 +2476,10 @@ case "$COMMAND" in
                # ./builder -bs test.spec -r AC-branch -Tp auto-ac- -tt
                if [ -n "$TEST_TAG" ]; then
                        local TAGVER=`make_tagver`
-                       tag_exist $TAGVER
+                       tag_exist $TAGVER || [ $TAGVER = $CVSTAG ] || Exit_error err_tag_exists $TAGVER
                        # check also tags created in CVS
-                       tag_exist $(echo $TAGVER | tr '[.@]' '[_#]')
+                       local TAGVER_CVS=$(echo $TAGVER | tr '[.@]' '[_#]')
+                       tag_exist $TAGVER_CVS || [ $TAGVER_CVS = $CVSTAG ] || Exit_error err_tag_exists $TAGVER_CVS
                        # - do not allow to build from HEAD when XX-branch exists
                        TREE_PREFIX=$(echo "$TAG_PREFIX" | sed -e 's#^auto/\([a-zA-Z]\+\)/.*#\1#g')
                        if [ "$TREE_PREFIX" != "$TAG_PREFIX" ]; then