changeset 1127:a4b3a6f8732c

2008-10-18 Matthias Klose <doko@ubuntu.com> * Makefile.am (stamps/patch{,-fsg,-ecj}.stamp): Fail if patches don't apply.
author doko@ubuntu.com
date Sat, 18 Oct 2008 12:09:17 +0200
parents 3e76a22e6d6f
children cd0b1ad5b02c
files ChangeLog Makefile.am
diffstat 2 files changed, 4 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/ChangeLog	Sat Oct 18 11:26:20 2008 +0200
+++ b/ChangeLog	Sat Oct 18 12:09:17 2008 +0200
@@ -1,7 +1,7 @@
 2008-10-18  Matthias Klose  <doko@ubuntu.com>
 
-	* Makefile.am (stamps/patch.stamp): Fail if patches don't apply,
-	call $(HG) only if it exists.
+	* Makefile.am (stamps/patch{,-fsg,-ecj}.stamp): Fail if patches don't
+	apply, call $(HG) only if it exists.
 
 2008-10-17  Deepak Bhole  <dbhole@redhat.com>
 
--- a/Makefile.am	Sat Oct 18 11:26:20 2008 +0200
+++ b/Makefile.am	Sat Oct 18 12:09:17 2008 +0200
@@ -692,7 +692,7 @@
 	if ! test x$${all_patches_ok} = "xyes"; then \
 	  echo ERROR patch $${all_patches_ok} FAILED! ; \
 	  echo WARNING make clean-patch before retrying a fix ; \
-	  false; \
+	  exit 2; \
 	fi ; 
 
 clean-patch-fsg:
@@ -786,7 +786,7 @@
 	if ! test x$${all_patches_ok} = "xyes"; then \
 	  echo ERROR patch $${all_patches_ok} FAILED! ; \
 	  echo WARNING make clean-patch before retrying a fix ; \
-	  false; \
+	  exit 2; \
 	fi
 
 clean-patch-ecj: