Update to 1.2:

- Properly propagate errors returned by cvs checkout and cvs update.

Problem reported by Nathan Arthur in private mail.  Change OKed by pmc.

3 files changed, 33 insertions, 4 deletions

diff --git a/devel/shtk/Makefile b/devel/shtk/Makefile
index ced350d843a..81de4273eb8 100644
--- a/devel/shtk/Makefile
+++ b/devel/shtk/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.3 2013/03/08 17:45:13 jmmv Exp $
+# $NetBSD: Makefile,v 1.4 2013/06/18 13:23:22 jmmv Exp $
 
-DISTNAME=	shtk-1.1
+DISTNAME=	shtk-1.2
 CATEGORIES=	devel
 MASTER_SITES=	# empty
 DISTFILES=	# empty
diff --git a/devel/shtk/files/cvs.subr b/devel/shtk/files/cvs.subr
index 28cda156f28..8560a5e23de 100644
--- a/devel/shtk/files/cvs.subr
+++ b/devel/shtk/files/cvs.subr
@@ -76,7 +76,7 @@ shtk_cvs_checkout() {
         || shtk_cli_error "Failed to create ${directory}"
     ( cd "${directory}"/.cvs-checkout &&
         shtk_process_run cvs -d"${cvsroot}" -q checkout -P ${rflag} \
-	"${module}" )
+	"${module}" ) || shtk_cli_error "CVS checkout failed"
     mv "${directory}"/.cvs-checkout/"${module}"/* "${directory}"/ \
         || true  # Maybe the checkout yielded no files...
     rm -rf "${directory}"/.cvs-checkout
@@ -107,5 +107,6 @@ shtk_cvs_update() {
     fi
 
     ( cd "${directory}" && \
-        shtk_process_run cvs -d"${cvsroot}" -q update -d -P ${rflag} )
+        shtk_process_run cvs -d"${cvsroot}" -q update -d -P ${rflag} ) \
+	|| shtk_cli_error "CVS update failed"
 }
diff --git a/devel/shtk/files/cvs_test.sh b/devel/shtk/files/cvs_test.sh
index dedb0ee04ba..dd297913d96 100644
--- a/devel/shtk/files/cvs_test.sh
+++ b/devel/shtk/files/cvs_test.sh
@@ -121,6 +121,19 @@ checkout__permission_denied_body() {
 }
 
 
+atf_test_case checkout__cvs_fails
+checkout__cvs_fails_body() {
+    init_cvsroot "${MOCK_CVSROOT}" src
+    if ( shtk_cvs_checkout "${MOCK_CVSROOT}" src "foo" $(pwd)/usr/src ) >out 2>err
+    then
+        atf_fail "Checkout succeeded, but should not"
+    else
+        grep "CVS checkout failed" err >/dev/null \
+            || atf_fail "Expected error message not found"
+    fi
+}
+
+
 atf_test_case update__ok
 update__ok_body() {
     init_cvsroot "${MOCK_CVSROOT}" first second
@@ -170,6 +183,19 @@ update__does_not_exist_body() {
 }
 
 
+atf_test_case update__cvs_fails
+update__cvs_fails_body() {
+    init_cvsroot "${MOCK_CVSROOT}" src
+    cvs -d "${MOCK_CVSROOT}" checkout src
+    if ( shtk_cvs_update "${MOCK_CVSROOT}" "foo" src ) >out 2>err; then
+        atf_fail "Update succeeded, but should not"
+    else
+        grep "CVS update failed" err >/dev/null \
+            || atf_fail "Expected error message not found"
+    fi
+}
+
+
 atf_init_test_cases() {
     atf_add_test_case fetch
 
@@ -177,8 +203,10 @@ atf_init_test_cases() {
     atf_add_test_case checkout__different_name
     atf_add_test_case checkout__already_exists
     atf_add_test_case checkout__permission_denied
+    atf_add_test_case checkout__cvs_fails
 
     atf_add_test_case update__ok
     atf_add_test_case update__resume_checkout
     atf_add_test_case update__does_not_exist
+    atf_add_test_case update__cvs_fails
 }