Author: arekm                        Date: Tue Sep 27 20:04:36 2005 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- break build from HEAD if XY-branch exits (commented out for now)

---- Files affected:
SPECS:
   builder (1.329 -> 1.330) 

---- Diffs:

================================================================
Index: SPECS/builder
diff -u SPECS/builder:1.329 SPECS/builder:1.330
--- SPECS/builder:1.329 Sun Sep 11 14:25:35 2005
+++ SPECS/builder       Tue Sep 27 22:04:30 2005
@@ -411,6 +411,10 @@
                        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 @@
                                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
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/builder?r1=1.329&r2=1.330&f=u

_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit

Reply via email to