Просмотр исходного кода

Dpkg::Arch: Map i786 to i386 for the multiarch pathname

Missed in commit 7386defdaebf4746dc074a118bf7430cecf7a57f.
Guillem Jover лет назад: 12
Родитель
Сommit
e7ec307653
2 измененных файлов с 2 добавлено и 1 удалено
  1. 1 0
      debian/changelog
  2. 1 1
      scripts/Dpkg/Arch.pm

+ 1 - 0
debian/changelog

@@ -69,6 +69,7 @@ dpkg (1.17.14) UNRELEASED; urgency=low
       Reported by Steven Chamberlain <steven@pyro.eu.org>.
     - On systems using libkvm, do not fail when kvm_getprocs() cannot find
       any process.
+  * Map i786 to i386 also for the multiarch pathname in dpkg-architecture.
 
   [ Raphaël Hertzog ]
   * Explain better in deb-triggers(5) why interest/activate-noawait should be

+ 1 - 1
scripts/Dpkg/Arch.pm

@@ -297,7 +297,7 @@ sub gnutriplet_to_multiarch($)
     my ($gnu) = @_;
     my ($cpu, $cdr) = split(/-/, $gnu, 2);
 
-    if ($cpu =~ /^i[456]86$/) {
+    if ($cpu =~ /^i[4567]86$/) {
 	return "i386-$cdr";
     } else {
 	return $gnu;