b1_4_xattr don't need special requirement for lnet since it's re-based

[fs/lustre-release.git] / lustrecvs

diff --git a/lustrecvs b/lustrecvs
index 4436462..2fb1256 100755 (executable)
--- a/lustrecvs
+++ b/lustrecvs
@@ -54,6 +54,12 @@ case "$lustretag" in
        exit 0
        ;;
 
+    b1_4_newconfig*|b_newconfig_rdmarouting*|b1_4_mountconf*)
+        buildtag="b_lnet"
+        ;;
+
+    v*) buildtag=$lustretag ;;
+
     # this is the branch table
     # keep this list sorted alphabetically!
 
@@ -63,6 +69,7 @@ case "$lustretag" in
 
 esac
 
+error_modules=
 cvs_cmd ()
 {
     dir="$1"
@@ -74,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
@@ -86,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"
@@ -95,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