Author: arekm Date: Tue Oct 4 20:57:52 2005 GMT
Module: SPECS Tag: HEAD
---- Log message:
- fail when build from head and xx-branch exists.
---- Files affected:
SPECS:
builder (1.332 -> 1.333)
---- Diffs:
================================================================
Index: SPECS/builder
diff -u SPECS/builder:1.332 SPECS/builder:1.333
--- SPECS/builder:1.332 Sun Oct 2 20:03:33 2005
+++ SPECS/builder Tue Oct 4 22:57:47 2005
@@ -1696,15 +1696,15 @@
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
+ 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.332&r2=1.333&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
