[Pkg-lustre-svn-commit] r446 - in /trunk/debian: changelog linux-patch-lustre.apply linux-patch-lustre.unpatch

[winnie at users.alioth.debian.org]

Author: winnie
Date: Tue Feb 19 09:00:04 2008
New Revision: 446

URL: http://svn.debian.org/wsvn/pkg-lustre/?sc=1&rev=446
Log:
Add patch for #466479

Modified:
    trunk/debian/changelog
    trunk/debian/linux-patch-lustre.apply
    trunk/debian/linux-patch-lustre.unpatch

Modified: trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-lustre/trunk/debian/changelog?rev=446&op=diff
==============================================================================
--- trunk/debian/changelog (original)
+++ trunk/debian/changelog Tue Feb 19 09:00:04 2008
@@ -2,12 +2,13 @@
 
   [ Patrick Winnertz ]
   * Add patch from David Brown in order to enable o2ib
+  * Use $QUILT in apply/unpatch script in linux-patch-lustre (Closes: #466479)
 
   [ Goswin von Brederlow ]
   * Replace autogen.sh patch with scripts from upstream cvs
   * Fix automake error and run autogen.sh at build time
 
- -- Patrick Winnertz <winnie at debian.org>  Wed, 13 Feb 2008 13:42:25 +0100
+ -- Patrick Winnertz <winnie at debian.org>  Tue, 19 Feb 2008 09:58:23 +0100
 
 lustre (1.6.4.2-1) unstable; urgency=low
 

Modified: trunk/debian/linux-patch-lustre.apply
URL: http://svn.debian.org/wsvn/pkg-lustre/trunk/debian/linux-patch-lustre.apply?rev=446&op=diff
==============================================================================
--- trunk/debian/linux-patch-lustre.apply (original)
+++ trunk/debian/linux-patch-lustre.apply Tue Feb 19 09:00:04 2008
@@ -58,7 +58,7 @@
 trap cleanup EXIT
 
 echo >&2 Setting up quilt
-quilt setup $TOPPATCHDIR/series/$KERNELRELEASE-vanilla.series 2>/dev/null
+$QUILT setup $TOPPATCHDIR/series/$KERNELRELEASE-vanilla.series 2>/dev/null
 ERR=$?
 if ! [ $ERR = 0 ]; then
   echo >&2 Quilt failed to initialize
@@ -67,12 +67,12 @@
 fi
 
 echo >&2 Applying lustre patches
-quilt push -a
+$QUILT push -a
 ERR=$?
 if ! [ $ERR = 0 ]; then
   echo >&2 Lustre patched failed to apply
   echo >&2 Reverting partialy applied patch
-  quilt pop -a
+  $QUILT pop -a
   cleanup
   exit $ERR
 fi

Modified: trunk/debian/linux-patch-lustre.unpatch
URL: http://svn.debian.org/wsvn/pkg-lustre/trunk/debian/linux-patch-lustre.unpatch?rev=446&op=diff
==============================================================================
--- trunk/debian/linux-patch-lustre.unpatch (original)
+++ trunk/debian/linux-patch-lustre.unpatch Tue Feb 19 09:00:04 2008
@@ -88,7 +88,7 @@
 mv debian/APPLIED_all_lustre_tmp/.pc.lustre .pc
 
 echo >&2 Unpatching lustre patches
-quilt pop -a
+$QUILT pop -a
 ERR=$?
 if ! [ $ERR = 0 ]; then
   cat >&2 <<EOF