[packages/rpm-build-tools] builder: enable to rebuild old auto tag more then once

[draenog]

commit d03404e71be0e2b224fd08c7f480b843078814fb
Author: Kacper Kornet <draenog at pld-linux.org>
Date:   Tue Sep 4 17:16:46 2012 +0100

    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.

 builder.sh | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)
---
diff --git a/builder.sh b/builder.sh
index 9bee8be..2529aa8 100755
--- 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
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/rpm-build-tools.git/commitdiff/d03404e71be0e2b224fd08c7f480b843078814fb