Revert my use of the configure_flags macro in the lustre.spec file and just

[fs/lustre-release.git] / lustrecvs

diff --git a/lustrecvs b/lustrecvs
index 30d6ff8..2bb3725 100755 (executable)
--- a/lustrecvs
+++ b/lustrecvs
@@ -19,19 +19,29 @@ fatal ()
 usage ()
 {
     cat <<EOF
-Usage: $progname lustretag
-  where lustretag is a tag of the lustre-core module
+Usage: $progname <lustretag>
+  where <lustretag> is a tag of the lustre-core module
 EOF
 }
 
 if [ -z "$LUSTRECVS_UPDATED" ] ; then
-    cvs up "$0" || fatal 1 "Error updating lustrecvs"
+    echo "$progname: updating lustrecvs"
+    cvs up -l || fatal 1 "Error updating lustrecvs"
     export LUSTRECVS_UPDATED=yes
     exec "$0" "$@"
 fi
 
+[ "$1" = "-r" ] && shift
+
 buildtag="HEAD"
 lustretag="$1"
+shift
+
+if [ "$*" ] ; then
+    usage >&2
+    exit 1
+fi
+
 
 case "$lustretag" in
     '')
@@ -44,6 +54,16 @@ case "$lustretag" in
        exit 0
        ;;
 
+    # These releases did not get build tagged for them because they
+    # this build system didn't exist when they were tagged
+    v1_2_8|v1_4_0) 
+        buildtag="HEAD"
+        ;;
+    
+    b_release_1_4_6-patchless) buildtag="HEAD" ;;
+
+    v* | b_release*) buildtag=$lustretag ;;
+
     # this is the branch table
     # keep this list sorted alphabetically!
 
@@ -53,6 +73,7 @@ case "$lustretag" in
 
 esac
 
+error_modules=
 cvs_cmd ()
 {
     dir="$1"
@@ -64,9 +85,12 @@ cvs_cmd ()
     if [ "$tag" = "HEAD" ] ; then
        cotag=""
        uptag="-A"
-    else
+    elif [ "$tag" ] ; then
        cotag="-r $tag"
        uptag="-r $tag"
+    else
+       # silently skip if no tag was specified
+       return
     fi
 
     if [ -d "$dir" ] ; then
@@ -74,7 +98,10 @@ cvs_cmd ()
        ( cd "$dir" && cvs up -dP $uptag )
     else
        echo "$progname: Checking out $dir from $tag"
-       cvs co $cotag -d "$dir" "$module"
+       cvs co -P $cotag -d "$dir" "$module"
+    fi
+    if [ $? != 0 ] ; then
+       error_modules="$dir $error_modules"
     fi
 }
 
@@ -85,3 +112,7 @@ if [ -f build/buildcvs ] ; then
 else
     fatal 1 "build/buildcvs does not exist; not updating other modules."
 fi
+
+if [ "$error_modules" ] ; then
+    fatal 1 "There were errors checking out the following directories: $error_modules"
+fi