Merge two fixes for rebuilding auto tags

diff --git a/builder.sh b/builder.sh
index 3284d4727f8ca02c9a111e86df327dd18a2999ec..9bee8beb8d79db2ebc6977dbea7e85e4fe62f854 100755 (executable)
--- a/builder.sh
+++ b/builder.sh
@@ -2506,12 +2506,13 @@ 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
+                       if [ "$TAGVER" != "$CVSTAG" -a "$TAGVER_CVS" != "$CVSTAG" -a  "$TREE_PREFIX" != "$TAG_PREFIX" ]; then
                                TAG_BRANCH="${TREE_PREFIX}-branch"
                                if [ -n "$DEPTH" ]; then
                                        cmd_branches="git ls-remote --heads"