From b662b030f4dad9681ed84f267b3e8792cbe97999 Mon Sep 17 00:00:00 2001
From: Thierry Vignaud <tv@mandriva.org>
Date: Wed, 3 Dec 2008 15:19:44 +0000
Subject: (add_restricted_medium) add 32 bit repositories on x86_64 too

---
 NEWS                        | 1 +
 mdkapplet                   | 3 ++-
 mdkapplet-restricted-helper | 2 ++
 3 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/NEWS b/NEWS
index d1cbe932..537d71b3 100644
--- a/NEWS
+++ b/NEWS
@@ -2,6 +2,7 @@
   o explain what is restricted media before actually asking for root
     privileges
 - mdkapplet-restricted-helper
+  o add 32 bit repositories on x86_64 too
   o fix banners' titles
   o fix vertical spacing between entries
   o prevent typing in empty password or login
diff --git a/mdkapplet b/mdkapplet
index 71b4091a..46823700 100755
--- a/mdkapplet
+++ b/mdkapplet
@@ -699,7 +699,8 @@ sub is_restricted_media_configured {
     my @names = map { $_->{name} } @restricted_media;
     # we need both 'Restricted' & 'Restricted Updates' media
     # those who did online update trough mdkapplet do not have restricted medium, hence the test for 2 medium:
-    @restricted_media >= 2 && (grep { /Restricted Updates/ } @names) && (grep { /Restricted/ && !/Updates/ } @names);
+    @restricted_media >= (urpm::cfg::get_arch() =~ /64/ ? 4 : 2)
+      && (grep { /Restricted Updates/ } @names) && (grep { /Restricted/ && !/Updates/ } @names);
 }
 
 sub really_prepare_add_restricted() {
diff --git a/mdkapplet-restricted-helper b/mdkapplet-restricted-helper
index d034e1f4..7ae481d0 100755
--- a/mdkapplet-restricted-helper
+++ b/mdkapplet-restricted-helper
@@ -121,6 +121,8 @@ sub add_restricted_medium {
     } else {
         my $arch = urpm::cfg::get_arch();
         actually_add_restricted_medium($ref, $password, $arch);
+        # FIXME: is not enough if we ever support sparc64, ppc64 and the like:
+        actually_add_restricted_medium($ref, $password, 'i586') if $arch eq 'x86_64';
     }
 }
 
-- 
cgit v1.2.1