From: Brian J. Murrell <brian.murrell@oracle.com>
Date: Tue, 22 Jun 2010 19:09:32 +0000 (-0400)
Subject: b=22790 strip the .patch off of the dpatch name
X-Git-Tag: v2_0_0-rc1~24
X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=commitdiff_plain;h=9c476e723c92a7c300c420fa612433f7643995fb;hp=004cc2b4c6eb32672985e2f4b4bbf9413e314547

b=22790 strip the .patch off of the dpatch name

When annotating the .dpatch files with the patch name, seeing as we
strip the .patch off and replace it with dpatch, do the same in the
annotation.
---

diff --git a/build/autoMakefile.am.toplevel b/build/autoMakefile.am.toplevel
index ef97458..b5d8898 100644
--- a/build/autoMakefile.am.toplevel
+++ b/build/autoMakefile.am.toplevel
@@ -156,7 +156,7 @@ debs:
 			desc=$$(cat $$file | sed -e '1,/^$$/d' -e '/^---$$/,$$d'); \
 			dpatch_file=$${file/.patch/.dpatch}; \
 			sed -e '1,/^---$$/d' $$file | \
-			  dpatch patch-template -p "$$file" "$$desc" > \
+			  dpatch patch-template -p "$${file%.patch}" "$$desc" > \
 			  $$dpatch_file; \
 			echo "faked by make debs run from git" > \
 			  ../patched/$$dpatch_file; \