X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustrecvs;h=bf88adc75a747b54251c9f7fa835f5a9263c036b;hb=4d62ed5bea8c4eb61c9c8415421bdf9e45c26da1;hp=b2b21f56b80a727dc8cd19762051e50a071478de;hpb=f2083ec37f1b140b8e8df3d1301bc67fa6c555fe;p=fs%2Flustre-release.git

diff --git a/lustrecvs b/lustrecvs
index b2b21f5..bf88adc 100755
--- a/lustrecvs
+++ b/lustrecvs
@@ -19,8 +19,8 @@ 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
 }
 
@@ -31,8 +31,17 @@ if [ -z "$LUSTRECVS_UPDATED" ] ; then
     exec "$0" "$@"
 fi
 
+[ "$1" = "-r" ] && shift
+
 buildtag="HEAD"
 lustretag="$1"
+shift
+
+if [ "$*" ] ; then
+    usage >&2
+    exit 1
+fi
+
 
 case "$lustretag" in
     '')
@@ -45,6 +54,12 @@ case "$lustretag" in
 	exit 0
 	;;
 
+    b1_4_newconfig*|b_newconfig_rdmarouting*)
+        buildtag="b_lnet"
+        ;;
+
+    v*) buildtag=$lustretag ;;
+
     # this is the branch table
     # keep this list sorted alphabetically!
 
@@ -54,6 +69,7 @@ case "$lustretag" in
 
 esac
 
+error_modules=
 cvs_cmd ()
 {
     dir="$1"
@@ -65,9 +81,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
@@ -77,6 +96,9 @@ cvs_cmd ()
 	echo "$progname: Checking out $dir from $tag"
 	cvs co -P $cotag -d "$dir" "$module"
     fi
+    if [ $? != 0 ] ; then
+	error_modules="$dir $error_modules"
+    fi
 }
 
 cvs_cmd build lustre-build "$buildtag"
@@ -86,3 +108,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