Land b_release_1_4_6 onto HEAD (20060223_1429)

[fs/lustre-release.git] / build / land1.sh

diff --git a/build/land1.sh b/build/land1.sh
index 6765c37..da2df67 100755 (executable)
--- a/build/land1.sh
+++ b/build/land1.sh
@@ -55,7 +55,7 @@ TEST_FILE=${TEST_FILE:-ChangeLog} # does this need to be smarter?
 check_tag() {
        [ -z "$1" ] && echo "check_tag() missing arg" && exit3
        [ "$1" = "HEAD" ] && return
-       $CVS log $dir/$TEST_FILE 2> /dev/null | grep -q "       $1: " && return
+       $CVS log ${dir%%/*}/$TEST_FILE 2> /dev/null | grep -q " $1: " && return
        echo "${progname}: tag $1 not found in $dir/$TEST_FILE"
        exit 2
 }
@@ -93,7 +93,7 @@ $CVS tag ${PARENT}_${CHILD}_LAND_PARENT_$date $dir
 echo "done"
 
 echo -n "Create land point on ${child} ${PARENT}_${CHILD}_LAND_CHILD_$date ..."
-$CVS rtag -r ${child} ${PARENT}_${CHILD}_LAND_CHILD_$date $module $dir
+$CVS tag -r ${child} ${PARENT}_${CHILD}_LAND_CHILD_$date $dir
 echo "done"
 
 echo -n "Preserve old base tag ${CHILD}_BASE as ${CHILD}_BASE_PREV ..."
@@ -106,7 +106,8 @@ $CVS update -j ${CHILD}_BASE -j ${PARENT}_${CHILD}_LAND_CHILD_$date $dir
 echo "done"
 
 echo -n "Recording conflicts in $CONFLICTS ..."
-if $CVS update | grep '^C' > $CONFLICTS; then
+$CVS update | awk '/^C/ { print $2 }' > $CONFLICTS
+if [ -s $CONFLICTS ] ; then
     echo "Conflicts found, fix before committing."
     cat $CONFLICTS
 else