commit 2fc07e25663764637bd62590b80928ba46ba6cd0
Author: Kacper Kornet <[email protected]>
Date: Fri Jul 20 08:37:51 2012 +0100
Allow to rebuild tag only with explicit -r option
builder.sh | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
---
diff --git a/builder.sh b/builder.sh
index 1c096b8..512e507 100755
--- 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
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
