[Pkg-lustre-svn-commit] updated: [d0dc2eb] Add a small patch to prevent version_tag.pl from failing

Patrick Winnertz winnie at debian.org
Fri Aug 6 10:40:19 UTC 2010


The following commit has been merged in the master branch:
commit d0dc2ebb7057c874eec514795b06570fe437f189
Author: Patrick Winnertz <winnie at debian.org>
Date:   Wed Aug 4 12:26:10 2010 +0200

    Add a small patch to prevent version_tag.pl from failing
    
    Signed-off-by: Patrick Winnertz <winnie at debian.org>

diff --git a/debian/patches/00list b/debian/patches/00list
index f148c5c..441370f 100644
--- a/debian/patches/00list
+++ b/debian/patches/00list
@@ -20,6 +20,7 @@ bug13852-quota_includes.dpatch
 enable-quota.dpatch
 fix-symlink-attack.dpatch
 use_bash_instead_of_sh.dpatch
+fix_version_tag-pl.dpatch
 #hotfixes for 1.8.2:
 fix-oot-builds.dpatch
 #fix_various_typecasts.dpatch
diff --git a/debian/patches/fix_version_tag-pl.dpatch b/debian/patches/fix_version_tag-pl.dpatch
new file mode 100755
index 0000000..b0548fa
--- /dev/null
+++ b/debian/patches/fix_version_tag-pl.dpatch
@@ -0,0 +1,21 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## fix_version_tag-pl.dpatch by Patrick Winnertz <winnie at debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
+ at DPATCH@
+diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' lustre~/lustre/scripts/version_tag.pl lustre/lustre/scripts/version_tag.pl
+--- lustre~/lustre/scripts/version_tag.pl	2010-01-11 04:29:50.000000000 +0100
++++ lustre/lustre/scripts/version_tag.pl	2010-08-04 12:25:25.942494281 +0200
+@@ -125,8 +125,8 @@
+         $last_mtime = time();
+     } else {
+         my $tree_status = new IO::File;
+-        if (!$tree_status->open("tree_status")) {
+-            die "unable to open the tree_status file: $!\n";
++        if (!$tree_status->open("configure")) {
++            die "unable to open the configure file: $!\n";
+         }
+         my $line;
+         while (defined($line = <$tree_status>)) {

-- 
Lustre Debian Packaging 



More information about the Pkg-lustre-svn-commit mailing list