From 183c2bb5405c33c61214160c5f551cde171f1cc4 Mon Sep 17 00:00:00 2001
From: "Vikram S. Adve" <vadve@cs.uiuc.edu>
Date: Sun, 15 Sep 2002 16:45:10 +0000
Subject: [PATCH] Check error condition after cvs returns.  Also remove -c
 option.

llvm-svn: 3728
---
 llvm/cvsupdate       | 7 ++++++-
 llvm/utils/cvsupdate | 7 ++++++-
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/llvm/cvsupdate b/llvm/cvsupdate
index fca274c810cc..2d21d21eda42 100755
--- a/llvm/cvsupdate
+++ b/llvm/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/llvm/utils/cvsupdate b/llvm/utils/cvsupdate
index fca274c810cc..2d21d21eda42 100755
--- a/llvm/utils/cvsupdate
+++ b/llvm/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