[paludis-commits] r4560 - in trunk: . paludis/repositories/e/ebuild/exheres-0

[zlin at svn.pioto.org]

Author: zlin
Date: 2008-04-13 17:20:46 +0000 (Sun, 13 Apr 2008)
New Revision: 4560

Modified:
   trunk/ChangeLog
   trunk/paludis/repositories/e/ebuild/exheres-0/build_functions.bash
Log:
Fix expatch error handling.

Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog	2008-04-13 16:32:34 UTC (rev 4559)
+++ trunk/ChangeLog	2008-04-13 17:20:46 UTC (rev 4560)
@@ -5,6 +5,11 @@
 only listed in SVN log. For a summary of what has changed between releases,
 see the NEWS file. This file is occasionally pruned to ChangeLog.old.bz2.
 
+2008-04-13 Bo Ørsted Andresen
+
+	* paludis/repositories/e/ebuild/exheres-0/build_functions.bash: Fix
+	expatch error handling.
+
 2008-04-13 David Leverton
 
 	* paludis/environments/paludis/: Support ${root} in

Modified: trunk/paludis/repositories/e/ebuild/exheres-0/build_functions.bash
===================================================================
--- trunk/paludis/repositories/e/ebuild/exheres-0/build_functions.bash	2008-04-13 16:32:34 UTC (rev 4559)
+++ trunk/paludis/repositories/e/ebuild/exheres-0/build_functions.bash	2008-04-13 17:20:46 UTC (rev 4560)
@@ -63,9 +63,9 @@
                 ;;
             esac
 
-            echo "${cmd} ${1} | patch -s ${patchlevel:--p1} ${options[@]}" 1>&2
-            ${cmd} "${1}" | patch -s ${patchlevel:--p1} "${options[@]}" || \
-                die "patch -s ${patchlevel:--p1} ${options[@]} ${1} failed"
+            echo "${cmd} ${1} | patch -s -f ${patchlevel:--p1} ${options[@]}" 1>&2
+            ${cmd} "${1}" | patch -s -f ${patchlevel:--p1} "${options[@]}"
+            assert "patch -s -f ${patchlevel:--p1} ${options[@]} ${1} failed"
         fi
         shift
     done