X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=blobdiff_plain;f=lustrecvs;h=fa24a0135ee0e7a669af648ed03e52528c108712;hp=30d6ff853a553a7f02f56b5fe7f048db2bee7702;hb=ec295cad998d4d5e7fc915491da5ac646dbc6af6;hpb=48647124556cf4ab0fd7cb88e55d711e0435840d

diff --git a/lustrecvs b/lustrecvs
index 30d6ff8..fa24a01 100755
--- a/lustrecvs
+++ b/lustrecvs
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 LC_COLLATE="C"
 progname="${0##*/}"
@@ -19,19 +19,31 @@ fatal ()
 usage ()
 {
     cat <<EOF
-Usage: $progname lustretag
-  where lustretag is a tag of the lustre-core module
+Usage: $progname <lustretag> <pindate>
+  where <lustretag> is a tag of the lustre-core module
+  and <pindate> is an optional quoted timestamp suitable for cvs -D
 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
+pindate=$1
+shift
+
+if [ "$*" ] ; then
+    usage >&2
+    exit 1
+fi
 
 case "$lustretag" in
     '')
@@ -47,12 +59,34 @@ case "$lustretag" in
     # this is the branch table
     # keep this list sorted alphabetically!
 
+    # These use special build directories 
+
+    b1_4*) buildtag="b1_4" ;;
+
+    b_release_1_4_6-patchless) buildtag="b1_4" ;;
+    b_release_1_4_7-test) buildtag="b_release_1_4_7" ;;
+
+    b_release*) buildtag=$lustretag ;;
+
+    b_uoss) buildtag=$lustretag ;;
+
+    # 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="b1_4"
+        ;;
+    
+    v*) buildtag=$lustretag ;;
+
+    # this is the branch table
+    # keep this list sorted alphabetically!
+
     *)
         buildtag="HEAD"
 	;;
-
 esac
 
+error_modules=
 cvs_cmd ()
 {
     dir="$1"
@@ -62,19 +96,33 @@ cvs_cmd ()
     update=""
 
     if [ "$tag" = "HEAD" ] ; then
-	cotag=""
-	uptag="-A"
+        cotag=""
+        uptag="-A"
+    elif [ "$tag" ] ; then
+        cotag="-r $tag"
+        uptag="-r $tag"
     else
-	cotag="-r $tag"
-	uptag="-r $tag"
+        # silently skip if no tag was specified
+        return
+    fi
+
+    # create a cvs date format that will survive shell expansion
+    if [ -n "$pindate" ]; then
+        datecmd=$(date -u +%s -d "$pindate")
+        datecmd="-D @$datecmd"
+    else
+        datecmd=""
     fi
 
     if [ -d "$dir" ] ; then
-	echo "$progname: Updating $dir to $tag"
-	( cd "$dir" && cvs up -dP $uptag )
+        echo "$progname: Updating $dir to $tag"
+        ( cd "$dir" && cvs up $datecmd -dAP $uptag )
     else
-	echo "$progname: Checking out $dir from $tag"
-	cvs co $cotag -d "$dir" "$module"
+        echo "$progname: Checking out $dir from $tag"
+        cvs co $datecmd -P $cotag -d "$dir" "$module"
+    fi
+    if [ $? != 0 ] ; then
+        error_modules="$dir $error_modules"
     fi
 }
 
@@ -85,3 +133,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