From: Adam Heath <doogie@debian.org>
Date: Sat, 24 Aug 2002 20:43:08 +0000 (+0000)
Subject: Previous install-infos(before 1.10) handled multiple dir file entries,
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3b1674a01b804a24e136538bf87d6e2c36efeee4;p=dpkg

Previous install-infos(before 1.10) handled multiple dir file entries,
because they would copy the entire stanza unmodified.  The newest version
does not do this, as it reformats the options, and thereby only takes the
first line.  So, we now split all the lines from the stanza, and process
them all.
---

diff --git a/ChangeLog b/ChangeLog
index ebce2bde..7493186b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+Sat Aug 24 15:36:41 CDT 2002 Adam Heath <doogie@debian.org>
+
+  * scripts/install-info.pl: Previous install-infos(before 1.10) handled
+    multiple dir file entries, because they would copy the entire stanza
+    unmodified.  The newest version does not do this, as it reformats the
+    options, and thereby only takes the first line.  So, we now split all
+    the lines from the stanza, and process them all.
+
 Sat Aug 24 14:47:56 CDT 2002 Adam Heath <doogie@debian.org>
 
   * archtable: Add i386-gnu0.3.
diff --git a/debian/changelog b/debian/changelog
index 71865632..2fa8be45 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -12,6 +12,11 @@ dpkg (1.10.5) unstable; urgency=low
   * Fixes for HURD:  Closes: #156545
     * Add i386-gnu0.3 to archtable.
     * Fix handling of static compiles, with regard to zlib.
+  * Previous install-infos(before 1.10) handled multiple dir file entries,
+    because they would copy the entire stanza unmodified.  The newest
+    version does not do this, as it reformats the options, and thereby
+    only takes the first line.  So, we now split all the lines from the
+    stanza, and process them all.
 
  -- Adam Heath <doogie@debian.org>  UNRELEASED
 
diff --git a/scripts/install-info.pl b/scripts/install-info.pl
index d5b5a405..b497192b 100755
--- a/scripts/install-info.pl
+++ b/scripts/install-info.pl
@@ -339,7 +339,7 @@ if (!$remove) {
         $mss= $#work+1;
     }
 
-    @work= (@work[0..$mss-1], $infoentry, @work[$mss..$#work]);
+    @work= (@work[0..$mss-1], map("$_\n",split(/\n/,$infoentry)), @work[$mss..$#work]);
     
 } else {