- don't use -B when tagging if cvs-nserver is used

[packages/rpm-build-tools.git] / builder.sh

diff --git a/builder.sh b/builder.sh
index 0fd383d4ee5eed187c2f8c0b26ac1fd8e30ce152..d7d8059cbccaeb614f3376db585429eafa821e52 100644 (file)
--- a/builder.sh
+++ b/builder.sh
@@ -192,6 +192,12 @@ else
        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_files()
                _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;