Author: adam-guest
Date: 2008-02-25 22:44:29 +0000 (Mon, 25 Feb 2008)
New Revision: 1055
Modified:
trunk/debian/changelog
trunk/scripts/mass-bug.pl
Log:
mass-bug: Correctly detect the start of a signature in the template
file (Closes: #467496)
Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog 2008-02-24 15:41:10 UTC (rev 1054)
+++ trunk/debian/changelog 2008-02-25 22:44:29 UTC (rev 1055)
@@ -50,6 +50,8 @@
configuration file (Closes: #467131)
* debsign: Allow multiple files to be signed in a single invocation
(Closes: #457355)
+ * mass-bug: Correctly detect the start of a signature in the template
+ file (Closes: #467496)
[ Christoph Berg ]
* dget:
Modified: trunk/scripts/mass-bug.pl
===================================================================
--- trunk/scripts/mass-bug.pl 2008-02-24 15:41:10 UTC (rev 1054)
+++ trunk/scripts/mass-bug.pl 2008-02-25 22:44:29 UTC (rev 1055)
@@ -266,9 +266,9 @@
my $usertags=shift;
$template_text=~s/#PACKAGE#/$package/g;
- if ($template_text =~ /\A(.*?)(^-- $.*)/m) { # there's a sig involved
- my ($presig, $sig) = ($1, $2);
- $template_text=fill("", "", $presig) . $sig;
+ if ($template_text =~ /\A(.*?)(^-- $)(.*)/ms) { # there's a sig involved
+ my ($presig, $sig) = ($1, $2 . $3);
+ $template_text=fill("", "", $presig) . "\n" . $sig;
} else {
$template_text=fill("", "", $template_text);
}
--
To unsubscribe, send mail to [EMAIL PROTECTED]
