- break build from HEAD if XY-branch exits (commented out for now)

Changed files:
    builder.sh -> 1.330

diff --git a/builder.sh b/builder.sh
index 63bc13d739281c587a64a721b5c414b2779420cf..3cda71ddcb37b1f9c5879a867e573191b6c9f742 100644 (file)
--- a/builder.sh
+++ b/builder.sh
@@ -411,6 +411,10 @@ Exit_error()
                        remove_build_requires
                        echo "Release ${2} not integer and not a snapshot.";
                        exit 10 ;;
+               "err_branch_exists" )
+                       remove_build_requires
+                       echo "Tree branch already exists (${2}).";
+                       exit 11 ;;
 
        esac
    echo "Unknown error."
@@ -1688,6 +1692,17 @@ case "$COMMAND" in
                                if [ -n "$TAGREL" ]; then
                                        Exit_error err_tag_exists "$TAGVER" "$TAGREL"
                                fi
+
+                               # - 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
+                               #        TAG_BRANCH="${TREE_PREFIX}-branch"
+                               #        TAG_STATUS=$(cvs status -v $SPECFILE | grep -Ei "${TAG_BRANCH}.+(branch: [0-9.]+)")
+                               #        if [ -n "$TAG_STATUS" -a "$CVSTAG" = "HEAD" ]; then
+                               #                 Exit_error err_branch_exists "$TAG_STATUS"
+                               #        fi
+                               #
+                               #fi
                        fi
 
                        if [ -n "$ICONS" ]; then