[csw-devel] SF.net SVN: gar:[21487] csw/mgar/gar/v2/gar.lib.mk

[chninkel at users.sourceforge.net]

Revision: 21487
          http://gar.svn.sourceforge.net/gar/?rev=21487&view=rev
Author:   chninkel
Date:     2013-07-10 14:34:21 +0000 (Wed, 10 Jul 2013)
Log Message:
-----------
gar/v2: make sure mgar stops when a patch failed to apply

Modified Paths:
--------------
    csw/mgar/gar/v2/gar.lib.mk

Modified: csw/mgar/gar/v2/gar.lib.mk
===================================================================
--- csw/mgar/gar/v2/gar.lib.mk	2013-07-10 14:15:10 UTC (rev 21486)
+++ csw/mgar/gar/v2/gar.lib.mk	2013-07-10 14:34:21 UTC (rev 21487)
@@ -742,7 +742,7 @@
 # apply xzipped patches
 xz-patch-%:
 	@echo " ==> Applying patch $(DOWNLOADDIR)/$*"
-	@xz -dc $(DOWNLOADDIR)/$* | $(GARPATCH)
+	@xz -dc $(DOWNLOADDIR)/$* | $(GARPATCH) || exit 1
 	@( if [ -z "$(NOGITPATCH)" ]; then \
 		cd $(PATCHDIR); git add -A; \
 		git commit -am "old xz-style patch: $*"; \
@@ -752,7 +752,7 @@
 # apply bzipped patches
 bz-patch-%:
 	@echo " ==> Applying patch $(DOWNLOADDIR)/$*"
-	@bzip2 -dc $(DOWNLOADDIR)/$* | $(GARPATCH)
+	@bzip2 -dc $(DOWNLOADDIR)/$* | $(GARPATCH) || exit 1
 	@( if [ -z "$(NOGITPATCH)" ]; then \
 		cd $(PATCHDIR); git add -A; \
 		git commit -am "old bz-style patch: $*"; \
@@ -762,7 +762,7 @@
 # apply gzipped patches
 gz-patch-%:
 	@echo " ==> Applying patch $(DOWNLOADDIR)/$*"
-	@gzip -dc $(DOWNLOADDIR)/$* | $(GARPATCH)
+	@gzip -dc $(DOWNLOADDIR)/$* | $(GARPATCH) || exit 1
 	@( if [ -z "$(NOGITPATCH)" ]; then \
 		cd $(PATCHDIR); git add -A; \
 		git commit -am "old gz-style patch: $*"; \
@@ -772,16 +772,16 @@
 # apply normal patches (git format-patch output or old-style diff -r)
 normal-patch-%:
 	@echo " ==> Applying patch $(DOWNLOADDIR)/$*"
-	@( if ggrep -q 'diff --git' $(abspath $(DOWNLOADDIR)/$*); then \
+	( if ggrep -q 'diff --git' $(abspath $(DOWNLOADDIR)/$*); then \
 		if [ -z "$(NOGITPATCH)" ]; then \
 			cd $(PATCHDIR);\
-			git am --ignore-space-change --ignore-whitespace $(abspath $(DOWNLOADDIR)/$*); \
+			git am --ignore-space-change --ignore-whitespace $(abspath $(DOWNLOADDIR)/$*) || exit 1; \
 		else \
-			$(GARPATCH) < $(DOWNLOADDIR)/$*; \
+			$(GARPATCH) < $(DOWNLOADDIR)/$* || exit 1; \
 		fi; \
 	  else \
 		echo Adding old-style patch...; \
-		$(GARPATCH) < $(DOWNLOADDIR)/$*; \
+		$(GARPATCH) < $(DOWNLOADDIR)/$* || exit 1; \
 		if [ -z "$(NOGITPATCH)" ]; then \
 			cd $(PATCHDIR); \
 			git add -A; \

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.