Author: adamg Date: Fri Mar 21 17:37:33 2008 GMT
Module: SPECS Tag: HEAD
---- Log message:
- don't use -B when tagging if cvs-nserver is used
---- Files affected:
SPECS:
builder (1.541 -> 1.542)
---- Diffs:
================================================================
Index: SPECS/builder
diff -u SPECS/builder:1.541 SPECS/builder:1.542
--- SPECS/builder:1.541 Fri Mar 21 16:10:17 2008
+++ SPECS/builder Fri Mar 21 18:37:28 2008
@@ -192,6 +192,12 @@
RPMBUILD="rpmbuild"
fi
+#
+# are we using cvs-nserver ?
+#
+cvs --version 2>&1 | grep -qv 'CVS-nserver'
+CVS_NSERVER=$?
+
POLDEK_INDEX_DIR="`$RPM --eval %_rpmdir`/"
POLDEK_CMD="$SU_SUDO /usr/bin/poldek --noask"
@@ -1218,7 +1224,7 @@
_tag=$TAGVER
fi;
is_tag_a_branch $_tag
- if [ $? -eq 0 ]; then
+ if [ $? -eq 0 -a $CVS_NSERVER -eq 0 ]; then
OPTIONS="$OPTIONS -B"
fi;
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/builder?r1=1.541&r2=1.542&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
