- move cvs access check earlier than cvsup()

Changed files:
    builder.sh -> 1.374

diff --git a/builder.sh b/builder.sh
index 42e391fef0038e4a58fe1f02e0b9c4b54838ab5a..c24d11d807cb1545dbf4805d5e1af7b8a09c0d64 100644 (file)
--- a/builder.sh
+++ b/builder.sh
@@ -634,12 +634,8 @@ cvsup()
         local OPTIONS="up "
         if [ -n "$CVSROOT" ]; then
                  OPTIONS="-d $CVSROOT $OPTIONS"
-        else
-                 if [ ! -s CVS/Root -a "$NOCVS" != "yes" ]; then
-                               echo "warning: No cvs access defined for SOURCES"
-                               NOCVS="yes"
-                 fi
         fi
+
         if [ -z "$CVSDATE" -a -z "$CVSTAG" ]; then
                  OPTIONS="$OPTIONS -A"
         else
@@ -684,6 +680,11 @@ get_files()
        if [ $# -gt 0 ]; then
                cd "$SOURCE_DIR"
 
+               if [ ! -s CVS/Root -a "$NOCVS" != "yes" ]; then
+                       echo "warning: No cvs access defined for SOURCES"
+                       NOCVS="yes"
+               fi
+
                local nf=$(echo "$GET_FILES" | wc -w)
                local nc=0
                local get_files_cvs=""