Whamcloud - gitweb
git://git.whamcloud.com
/
fs
/
lustre-release.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
- minor tweaks for b_release_1_4_6-patchless
[fs/lustre-release.git]
/
lustrecvs
diff --git
a/lustrecvs
b/lustrecvs
index
bcce779
..
c647235
100755
(executable)
--- a/
lustrecvs
+++ b/
lustrecvs
@@
-1,5
+1,6
@@
#!/bin/sh
#!/bin/sh
+LC_COLLATE="C"
progname="${0##*/}"
warn ()
progname="${0##*/}"
warn ()
@@
-18,13
+19,29
@@
fatal ()
usage ()
{
cat <<EOF
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
}
EOF
}
+if [ -z "$LUSTRECVS_UPDATED" ] ; then
+ 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"
buildtag="HEAD"
lustretag="$1"
+shift
+
+if [ "$*" ] ; then
+ usage >&2
+ exit 1
+fi
+
case "$lustretag" in
'')
case "$lustretag" in
'')
@@
-37,11
+54,18
@@
case "$lustretag" in
exit 0
;;
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=b_release_1_4_6 ;;
+
+ v* | b_release*) buildtag=$lustretag ;;
+
# this is the branch table
# keep this list sorted alphabetically!
# this is the branch table
# keep this list sorted alphabetically!
- b1_2)
- portalstag="b1_2"
- ;;
*)
buildtag="HEAD"
*)
buildtag="HEAD"
@@
-49,28
+73,35
@@
case "$lustretag" in
esac
esac
+error_modules=
cvs_cmd ()
{
cvs_cmd ()
{
-
local
dir="$1"
-
local
module="$2"
-
local
tag="$3"
-
local
cotag=""
-
local
update=""
+ dir="$1"
+ module="$2"
+ tag="$3"
+ cotag=""
+ update=""
if [ "$tag" = "HEAD" ] ; then
cotag=""
uptag="-A"
if [ "$tag" = "HEAD" ] ; then
cotag=""
uptag="-A"
- el
se
+ el
if [ "$tag" ] ; then
cotag="-r $tag"
uptag="-r $tag"
cotag="-r $tag"
uptag="-r $tag"
+ else
+ # silently skip if no tag was specified
+ return
fi
if [ -d "$dir" ] ; then
echo "$progname: Updating $dir to $tag"
fi
if [ -d "$dir" ] ; then
echo "$progname: Updating $dir to $tag"
- ( cd "$dir" && cvs up $uptag )
+ ( cd "$dir" && cvs up
-dP
$uptag )
else
echo "$progname: Checking out $dir from $tag"
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
}
fi
}
@@
-81,3
+112,7
@@
if [ -f build/buildcvs ] ; then
else
fatal 1 "build/buildcvs does not exist; not updating other modules."
fi
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