From 339b99d3dffb333ed05205dc41e3532fe91a52e8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gwenol=C3=A9=20Beauchesne?= <gbeauchesne@mandriva.org>
Date: Wed, 25 Aug 2004 05:32:54 +0000
Subject: Always prefer 64-bit packages for updates on biarch platforms.

---
 perl-install/crypto.pm | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

(limited to 'perl-install')

diff --git a/perl-install/crypto.pm b/perl-install/crypto.pm
index 7cd0b2447..cf8495856 100644
--- a/perl-install/crypto.pm
+++ b/perl-install/crypto.pm
@@ -44,6 +44,14 @@ use ftp;
 
 %mirrors = ();
 
+sub compat_arch_for_updates($) {
+    # FIXME: We prefer 64-bit packages to update on biarch platforms,
+    # since the system is populated with 64-bit packages anyway.
+    my ($arch) = @_;
+    return $arch =~ /x86_64|amd64/ if (arch() eq 'x86_64');
+    MDK::Common::System::compat_arch($arch);
+}
+
 sub mirror2text { $mirrors{$_[0]} && $mirrors{$_[0]}[0] . '|' . $_[0] }
 sub mirrors {
     my ($o_distro_type) = @_;
@@ -60,7 +68,7 @@ sub mirrors {
 	my $sub_dir = $distro_type =~ /cooker|community/ ? '' : ($::corporate ? '/corporate' : '') . '/' . version();
 	foreach (<$f>) {
 	    my ($arch, $url, $dir) = m|$distro_type([^:]*):ftp://([^/]*)(/\S*)| or next;
-	    MDK::Common::System::compat_arch($arch) or
+	    compat_arch_for_updates($arch) or
 		log::l("ignoring updates from $url because of incompatible arch: $arch"), next;
 	    my $land = N("United States");
 	    foreach (keys %url2land) {
-- 
cgit v1.2.1