From: Ian Zimmerman <itz@buug.org>
Date: Tue, 1 Jan 2008 01:19:49 +0000 (+0200)
Subject: install-info: Ignore wrapped lines when matching section titles
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f780069c1aea962236c92968c05bbd21db30d3eb;p=dpkg

install-info: Ignore wrapped lines when matching section titles

Closes: #214684
---

diff --git a/ChangeLog b/ChangeLog
index 03596482..8e06afac 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2008-01-01  Ian Zimmerman  <itz@buug.org>
+
+	* scripts/install-info.pl: Ignore wrapped lines when matching
+	section titles.
+
 2008-01-01  John Zaitseff  <J.Zaitseff@zap.org.au>
 
 	* dselect/baselist.cc (baselist::wordwrapinfo): Stop processing when
diff --git a/debian/changelog b/debian/changelog
index ffd368a1..141ceaf4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -18,6 +18,9 @@ dpkg (1.14.15) UNRELEASED; urgency=low
   * Do not loop endlessly in dselect with very long package descriptions.
     Closes: #179320, #342495
     Thanks to John Zaitseff.
+  * Ignore wrapped lines in install-info when matching section titles.
+    Closes: #214684
+    Thanks to Andreas Metzler and Ian Zimmerman.
 
   [ Updated dpkg translations ]
   * Norwegian Bokmål (Hans Fredrik Nordhaug). Closes: #457918
diff --git a/scripts/install-info.pl b/scripts/install-info.pl
index 906322c5..edaded69 100755
--- a/scripts/install-info.pl
+++ b/scripts/install-info.pl
@@ -352,7 +352,7 @@ if (!$remove) {
         $mss= -1;
         for ($i=0; $i<=$#work; $i++) {
             $_= $work[$i];
-            next if m/^\*/;
+            next if m/^(\*|\s)/;
             next unless m/$sectionre/io;
             $mss= $i+1; last;
         }