[Reproducible-commits] [dpkg] 08/17: Dpkg::Arch: Do not overwrite triplet mappings with latter matches

[Holger Levsen]

This is an automated email from the git hooks/post-receive script.

holger pushed a commit to annotated tag 1.16.13
in repository dpkg.

commit f118b9bb27534a2dd2927771abb931b0d3b5da8d
Author: Guillem Jover <guillem at debian.org>
Date:   Thu Jul 4 00:56:36 2013 +0200

    Dpkg::Arch: Do not overwrite triplet mappings with latter matches
    
    Required for the new mipsn32(el) and mips64(el) architecture entries.
    
    Cherry picked from commit aa16b40d19677307dc1d21327c10e9a5ff9908ea.
---
 debian/changelog     | 2 ++
 scripts/Dpkg/Arch.pm | 3 +++
 2 files changed, 5 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index f86d091..274d01f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,8 @@ dpkg (1.16.13) UNRELEASED; urgency=low
     cause a segfault in case the function returns 0 entries.
   * Do not generate perl warnings on undef versions in
     Dpkg::Deps::deps_compare(). See: #737731
+  * Do not overwrite triplet mappings with latter matches in Dpkg::Arch.
+    Required for the new mipsn32(el) and mips64(el) architecture entries.
 
   [ Updated scripts translations ]
   * Fix a typo in the German scripts translation.
diff --git a/scripts/Dpkg/Arch.pm b/scripts/Dpkg/Arch.pm
index bfee423..9e86272 100644
--- a/scripts/Dpkg/Arch.pm
+++ b/scripts/Dpkg/Arch.pm
@@ -232,6 +232,9 @@ sub read_triplettable()
 		    (my $dt = $debtriplet) =~ s/<cpu>/$_cpu/;
 		    (my $da = $debarch) =~ s/<cpu>/$_cpu/;
 
+		    next if exists $debarch_to_debtriplet{$da}
+		         or exists $debtriplet_to_debarch{$dt};
+
 		    $debarch_to_debtriplet{$da} = $dt;
 		    $debtriplet_to_debarch{$dt} = $da;
 		}

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/reproducible/dpkg.git