Check error condition after cvs returns. Also remove -c option.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@3728 91177308-0d34-0410-b5e6-96231b3b80d8

diff --git a/cvsupdate b/cvsupdate
index fca274c810ccf6c8a234d67b3c4eb8cb8f5c08dd..2d21d21eda428900cbcded3986c9dcfc3d72088e 100755 (executable)
--- a/cvsupdate
+++ b/cvsupdate
@@ -1,4 +1,4 @@
-#!/bin/csh -f -c
+#!/bin/csh -f
 #
 # This script updates the entire tree, saves the output in cvs.out,
 # and then separately prints out the files that had merge conflicts,
@@ -31,6 +31,11 @@ end
 if ($doit == 1) then
     /bin/mv -f cvs.out cvs.out.bak
     cvs update -P -d >& cvs.out
+    if ($status != 0) then
+        echo "ERROR: CVS update failed: "
+       cat cvs.out
+       exit 1
+    endif
 else
     echo ""; echo "Not updating files."; echo ""
 endif

diff --git a/utils/cvsupdate b/utils/cvsupdate
index fca274c810ccf6c8a234d67b3c4eb8cb8f5c08dd..2d21d21eda428900cbcded3986c9dcfc3d72088e 100755 (executable)
--- a/utils/cvsupdate
+++ b/utils/cvsupdate
@@ -1,4 +1,4 @@
-#!/bin/csh -f -c
+#!/bin/csh -f
 #
 # This script updates the entire tree, saves the output in cvs.out,
 # and then separately prints out the files that had merge conflicts,
@@ -31,6 +31,11 @@ end
 if ($doit == 1) then
     /bin/mv -f cvs.out cvs.out.bak
     cvs update -P -d >& cvs.out
+    if ($status != 0) then
+        echo "ERROR: CVS update failed: "
+       cat cvs.out
+       exit 1
+    endif
 else
     echo ""; echo "Not updating files."; echo ""
 endif