tags 57194 patch
thanks
The following patch is available as
dpkg--devel--1.13--patch-7
from
http://planck.djpig.de/~djpig/vcs/arch/[EMAIL PROTECTED]/
--- orig/ChangeLog
+++ mod/ChangeLog
@@ -1,3 +1,8 @@
+2005-07-24 Frank Lichtenheld <[EMAIL PROTECTED]>
+
+ * scripts/controllib.pl (parsecdata): ignore trailing newlines
+ in single paragraph control files.
+
2005-07-17 Frank Lichtenheld <[EMAIL PROTECTED]>
* scripts/controllib.pl (parsedep): give a warning explaining
--- orig/debian/changelog
+++ mod/debian/changelog
@@ -8,6 +8,8 @@
* Let dpkg-checkbuilddeps exit with an error when parsedep
returns undef since this indicates an error
(Frank Lichtenheld). Closes: #171762, #302229.
+ * Ignore trailing newlines in single paragraph control files
+ (Frank Lichtenheld). Closes: #57194, #156319
--
--- orig/scripts/controllib.pl
+++ mod/scripts/controllib.pl
@@ -286,7 +286,7 @@
if ($many>0) {
$index++; $cf='';
} elsif ($many == -2) {
- $_= <CDATA>;
+ $_= <CDATA> while defined($_) && $_ =~ /^\s*$/;
length($_) ||
&syntax("expected PGP signature, found EOF after blank
line");
s/\n$//;
@@ -294,7 +294,10 @@
&syntax("expected PGP signature, found something else
\`$_'");
$many= -3; last;
} else {
- &syntax("found several \`paragraphs' where only one
expected");+ while (<CDATA>) {
+ /^\s*$/ ||
+ &syntax("found several \`paragraphs' where only one
expected");
+ }
}
} else {
&syntax("line with unknown format (not field-colon-value)");
Gruesse,
--
Frank Lichtenheld <[EMAIL PROTECTED]>
www: http://www.djpig.de/
--
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]
