changeset 1098:8f72a8d4acc3

Add ALLOW_PATCH_FAILURE config switch to continue despite failed patches.
author Rob Landley <rob@landley.net>
date Sat, 05 Jun 2010 00:08:28 -0500
parents 75113ff9bb32
children 3c6263354ca9
files config sources/functions.sh
diffstat 2 files changed, 6 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/config	Wed Jun 02 21:09:11 2010 -0500
+++ b/config	Sat Jun 05 00:08:28 2010 -0500
@@ -117,6 +117,10 @@
 
 # export EXTRACT_ALL=1
 
+# Set this to continue despite failed patches.
+
+# export ALLOW_PATCH_FAILURE=1
+
 # This isn't actually one of our variables, but a number of packages listen
 # to this to add extra debug info to their binaries.  (Use with SKIP_STRIP)
 
--- a/sources/functions.sh	Wed Jun 02 21:09:11 2010 -0500
+++ b/sources/functions.sh	Sat Jun 05 00:08:28 2010 -0500
@@ -188,7 +188,8 @@
     if [ -f "$i" ]
     then
       echo "Applying $i"
-      (cd "${SRCTREE}/${PACKAGE}" && patch -p1 -i "$i") || dienow
+      (cd "${SRCTREE}/${PACKAGE}" && patch -p1 -i "$i") ||
+        ([ -z "$ALLOW_PATCH_FAILURE" ] && dienow)
       sha1file "$i" >> "$SHA1FILE"
     fi
   done