X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2Fscripts%2Fland2.sh;h=2bb9fade4c6250e73dffce5e4c2b9a30c00b67c5;hb=090c677210ee2946d99c71412e4ff762bb300f4f;hp=6690e7d904da75eafdb2c4d461faf9256f41d13e;hpb=42a807b66b280a7a25cdba76984fab18c0533aa8;p=fs%2Flustre-release.git

diff --git a/lustre/scripts/land2.sh b/lustre/scripts/land2.sh
index 6690e7d..2bb9fad 100755
--- a/lustre/scripts/land2.sh
+++ b/lustre/scripts/land2.sh
@@ -9,13 +9,13 @@ fi
 
 . .mergeinfo
 
-if [ -f $CONFLICTS ] ; then
+if [ -f "$CONFLICTS" ] ; then
     echo "$CONFLICTS exists - clean up first"
     cat $CONFLICTS
     exit 
 fi
 
-cvs update $dir 2>&1 | grep "^M" && echo "uncommitted changes" && exit 1
+#cvs update $dir 2>&1 | grep "^M" && echo "uncommitted changes" && exit 1
 
 echo -n "Tagging as ${CHILD}_BASE_$date ..."
 $CVS tag -F ${CHILD}_BASE_$date $dir