builder: enable to rebuild old auto tag more then once

The previous version failed in the following scenario:
1. Old auto tag exists and it is rebuild. In the result
new style autotag is created.
2. Both style autotags cannor be rebuild any more.

After fix the new style autotag can be rebuild.

diff --git a/builder.sh b/builder.sh
index 9bee8beb8d79db2ebc6977dbea7e85e4fe62f854..2529aa8765161744735845903a36e78e4d9b7e1d 100755 (executable)
--- a/builder.sh
+++ b/builder.sh
@@ -2509,7 +2509,9 @@ case "$COMMAND" in
                        tag_exist $TAGVER || [ $TAGVER = $CVSTAG ] || Exit_error err_tag_exists $TAGVER
                        # check also tags created in CVS
                        local TAGVER_CVS=$(echo $TAGVER | tr '[.@]' '[_#]')
-                       tag_exist $TAGVER_CVS || [ $TAGVER_CVS = $CVSTAG ] || Exit_error err_tag_exists $TAGVER_CVS
+                       local CVSTAG_CVS=$(echo $CVSTAG | tr '[.@]' '[_#]')
+                       tag_exist $TAGVER_CVS || [ $TAGVER_CVS = $CVSTAG_CVS ] \
+                               || 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 [ "$TAGVER" != "$CVSTAG" -a "$TAGVER_CVS" != "$CVSTAG" -a  "$TREE_PREFIX" != "$TAG_PREFIX" ]; then