Dpkg::Arch: Force a sane input record separator for file parsing functions

diff --git a/ChangeLog b/ChangeLog
index 07b45e8ac4477980d6e653eda612d98fe94df914..9bf88316dd6fe2b51926895fd12f1e1f95a92925 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2007-11-15  Guillem Jover  <guillem@debian.org>
+
+       * scripts/Dpkg/Arch.pm (read_cputable): Force a sane input record
+       separator.
+       (read_ostable): Likewise.
+       (read_triplettable): Likewise.
+
 2007-11-04  Guillem Jover  <guillem@debian.org>
 
        * scripts/Makefile.am (clean): Set PERL5LIB to force use of shipped

diff --git a/scripts/Dpkg/Arch.pm b/scripts/Dpkg/Arch.pm
index 714a63e7aff393d5401ce496edd2dfd1e673bbd4..080ee59182d45bc8b19a5eda130e797f52337bf2 100644 (file)
--- a/scripts/Dpkg/Arch.pm
+++ b/scripts/Dpkg/Arch.pm
@@ -104,6 +104,7 @@ sub get_valid_arches()
 sub read_cputable
 {
     local $_;
+    local $/ = "\n";
 
     open CPUTABLE, "$pkgdatadir/cputable"
        or syserr(_g("unable to open cputable"));
@@ -120,6 +121,7 @@ sub read_cputable
 sub read_ostable
 {
     local $_;
+    local $/ = "\n";
 
     open OSTABLE, "$pkgdatadir/ostable"
        or syserr(_g("unable to open ostable"));
@@ -138,6 +140,7 @@ sub read_triplettable()
     read_cputable() if (!@cpu);
 
     local $_;
+    local $/ = "\n";
 
     open TRIPLETTABLE, "$pkgdatadir/triplettable"
        or syserr(_g("unable to open triplettable"));