The following commit has been merged in the master branch:
commit 5dad88ee42612bdbb7e339a981f1392cfb531638
Author: Patrick Winnertz <win...@debian.org>
Date:   Wed Jul 28 14:28:40 2010 +0200

    Using /bin/bash as interpreter for lnet-selftest (Closes: #581121)
    
    Signed-off-by: Patrick Winnertz <win...@debian.org>

diff --git a/debian/patches/fix_bashisms_for_dash.dpatch 
b/debian/patches/fix_bashisms_for_dash.dpatch
index 2e0b01c..ba7385f 100755
--- a/debian/patches/fix_bashisms_for_dash.dpatch
+++ b/debian/patches/fix_bashisms_for_dash.dpatch
@@ -5,46 +5,51 @@
 ## DP: fix some bashisms by switching the interpreter from sh to bash
 
 @DPATCH@
-diff --git a/lustre/tests/llog-test.sh b/lustre/tests/llog-test.sh
-index 1de2b4f..e5bbd3d 100644
---- a/lustre/tests/llog-test.sh
-+++ b/lustre/tests/llog-test.sh
+diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' 
'--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' 
lustre~/ldiskfs/configure.ac lustre/ldiskfs/configure.ac
+--- lustre~/ldiskfs/configure.ac       2010-07-28 14:28:02.884964948 +0200
++++ lustre/ldiskfs/configure.ac        2010-07-28 14:28:03.136965577 +0200
+@@ -91,7 +91,7 @@
+ fi
+ 
+ AC_SUBST(BACKFS)
+-BACKFSU=${BACKFS/ext/EXT}
++BACKFSU=`echo $BACKFS | sed -e 's#ext#EXT#'`
+ AC_SUBST(BACKFSU) # We need a Upper string
+ 
+ AM_CONDITIONAL(USE_EXT4, test x$enable_ext4 = xyes)
+diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' 
'--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' 
lustre~/lustre/tests/llog-test.sh lustre/lustre/tests/llog-test.sh
+--- lustre~/lustre/tests/llog-test.sh  2010-01-11 04:29:50.000000000 +0100
++++ lustre/lustre/tests/llog-test.sh   2010-07-28 14:28:03.136965577 +0200
 @@ -1,4 +1,4 @@
 -#!/bin/sh
 +#!/bin/bash
  
  set -e
  
-diff --git a/lustre/tests/mdsrate-stat-large.sh 
b/lustre/tests/mdsrate-stat-large.sh
-index 730eb01..5974e39 100644
---- a/lustre/tests/mdsrate-stat-large.sh
-+++ b/lustre/tests/mdsrate-stat-large.sh
+diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' 
'--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' 
lustre~/lustre/tests/lnet-selftest.sh lustre/lustre/tests/lnet-selftest.sh
+--- lustre~/lustre/tests/lnet-selftest.sh      2010-04-10 02:28:57.000000000 
+0200
++++ lustre/lustre/tests/lnet-selftest.sh       2010-07-28 14:28:24.855977956 
+0200
+@@ -1,4 +1,4 @@
+-#!/bin/sh
++#!/bin/bash
+ 
+ LUSTRE=${LUSTRE:-$(cd $(dirname $0)/..; echo $PWD)}
+ . $LUSTRE/tests/test-framework.sh
+diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' 
'--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' 
lustre~/lustre/tests/mdsrate-stat-large.sh 
lustre/lustre/tests/mdsrate-stat-large.sh
+--- lustre~/lustre/tests/mdsrate-stat-large.sh 2010-04-10 02:28:57.000000000 
+0200
++++ lustre/lustre/tests/mdsrate-stat-large.sh  2010-07-28 14:28:03.136965577 
+0200
 @@ -1,4 +1,4 @@
 -#!/bin/sh
 +#!/bin/bash
  #
  # This test was used in a set of CMD3 tests (cmd3-8 test).
  
-diff --git a/lustre/tests/rundbench b/lustre/tests/rundbench
-index ad938da..ab9f236 100755
---- a/lustre/tests/rundbench
-+++ b/lustre/tests/rundbench
+diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' 
'--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' 
lustre~/lustre/tests/rundbench lustre/lustre/tests/rundbench
+--- lustre~/lustre/tests/rundbench     2010-01-11 04:29:50.000000000 +0100
++++ lustre/lustre/tests/rundbench      2010-07-28 14:28:03.136965577 +0200
 @@ -1,4 +1,4 @@
 -#!/bin/sh
 +#!/bin/bash
  
  LUSTRE=${LUSTRE:-$(cd $(dirname $0)/..; echo $PWD)}
  . $LUSTRE/tests/test-framework.sh
-diff --git a/ldiskfs/configure.ac b/ldiskfs/configure.ac
-index 6644fe5..a343eaf 100644
---- a/ldiskfs/configure.ac
-+++ b/ldiskfs/configure.ac
-@@ -91,7 +91,7 @@ else
- fi
- 
- AC_SUBST(BACKFS)
--BACKFSU=${BACKFS/ext/EXT}
-+BACKFSU=`echo $BACKFS | sed -e 's#ext#EXT#'`
- AC_SUBST(BACKFSU) # We need a Upper string
- 
- AM_CONDITIONAL(USE_EXT4, test x$enable_ext4 = xyes)

-- 
Lustre Debian Packaging 

_______________________________________________
Pkg-lustre-svn-commit mailing list
Pkg-lustre-svn-commit@lists.alioth.debian.org
http://lists.alioth.debian.org/mailman/listinfo/pkg-lustre-svn-commit

Reply via email to