[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

r1232 - trunk/kfreebsd-6/debian



Author: rmh
Date: 2006-02-17 19:22:56 +0000 (Fri, 17 Feb 2006)
New Revision: 1232

Modified:
   trunk/kfreebsd-6/debian/changelog
   trunk/kfreebsd-6/debian/rules
Log:
rules: Run patch with --dry-run first.  This way if a patch fails the tree isn't left in an inconsistent state.

Modified: trunk/kfreebsd-6/debian/changelog
===================================================================
--- trunk/kfreebsd-6/debian/changelog	2006-02-17 19:12:53 UTC (rev 1231)
+++ trunk/kfreebsd-6/debian/changelog	2006-02-17 19:22:56 UTC (rev 1232)
@@ -28,8 +28,10 @@
   * Fix /dev permissions in userland.
     - control.flavor.in (Depends): Add kfreebsd-common.
     - patches/900_devfs_perm_fixes.diff: Remove.
+  * rules: Run patch with --dry-run first.  This way if a patch fails
+    the tree isn't left in an inconsistent state.
 
- -- Robert Millan <rmh@aybabtu.com>  Fri, 17 Feb 2006 19:06:37 +0100
+ -- Robert Millan <rmh@aybabtu.com>  Fri, 17 Feb 2006 20:20:41 +0100
 
 kfreebsd-5 (5.3-6) unstable; urgency=low
 

Modified: trunk/kfreebsd-6/debian/rules
===================================================================
--- trunk/kfreebsd-6/debian/rules	2006-02-17 19:12:53 UTC (rev 1231)
+++ trunk/kfreebsd-6/debian/rules	2006-02-17 19:22:56 UTC (rev 1232)
@@ -72,7 +72,8 @@
 	
 	set -e ; for i in $(CURDIR)/debian/patches/*.diff ; do \
 		echo "--- Patch $$i ---" ; \
-		cat $$i | patch -p0 -d src/ ; \
+		patch -p0 -d src/ --dry-run < $$i ; \
+		patch -p0 -d src/ < $$i ; \
 	done
 
 build-indep: build-indep-stamp



Reply to: