(choose_mirror,easy_add_callback,mirrors) drop arch choice

2 files changed, 3 insertions, 13 deletions

diff --git a/Rpmdrake/edit_urpm_sources.pm b/Rpmdrake/edit_urpm_sources.pm
index fc8768e5..9931f817 100644
--- a/Rpmdrake/edit_urpm_sources.pm
+++ b/Rpmdrake/edit_urpm_sources.pm
@@ -110,8 +110,6 @@ sub easy_add_callback() {
     # when called on early init by rpmdrake
     $urpm ||= fast_open_urpmi_db();
 
-    my $arch = arch();
-    $arch = 'i586' if $arch =~ /^i.86$/;
     #- cooker and community don't have update sources
     my $want_base_distro = distro_type(0) eq 'updates' ? interactive_msg(
 	N("Choose media type"),
@@ -122,16 +120,9 @@ repositories, giving you access to more software than can fit on the Mandriva
 discs. Please choose whether to configure update sources only, or the full set
 of sources."),
 	 transient => $::main_window,
-     if_($arch eq 'x86_64', widget => gtknew('HBox', children => [
-         0, gtknew('Label', text => "Architecture: "),
-         1, gtknew('ComboBox', text_ref => \$arch, list => [ arch(), 'i586' ]),
-     ]),
-     ),
 	yesno => 1, text => { yes => N("Full set of sources"), no => N("Update sources only") },
     ) : 1;
     my $distro = $rpmdrake::mandrake_release;
-    my $real_arch = arch();
-    $distro =~ s/$real_arch/$arch/;
     my ($mirror) = choose_mirror($urpm, message =>
 N("This will attempt to install all official sources corresponding to your
 distribution (%s).
@@ -142,7 +133,6 @@ Please check that your network is currently running.
 Is it ok to continue?", $distro),
 	want_base_distro => $want_base_distro,
      transient => $::main_window,
-     'arch' => $arch,
     ) or return 0;
     ref $mirror or return;
     my $wait = wait_msg(N("Please wait, adding media..."));
diff --git a/rpmdrake.pm b/rpmdrake.pm
index 53c2bca6..afa4c599 100644
--- a/rpmdrake.pm
+++ b/rpmdrake.pm
@@ -499,7 +499,7 @@ sub compat_arch_for_updates($) {
 }
 
 sub mirrors {
-    my ($urpm, $want_base_distro, $o_arch) = @_;
+    my ($urpm, $want_base_distro) = @_;
     my $cachedir = $urpm->{cachedir} || '/root';
     use mirror;
     mirror::register_downloader(sub {
@@ -513,7 +513,7 @@ sub mirrors {
                                     return cat_($file);
                                 });
     my @mirrors = @{ mirror::list(common::parse_LDAP_namespace_structure(cat_('/etc/product.id')),
-                                  ($want_base_distro ? 'distrib' : 'updates'), $o_arch) || [] };
+                                  ($want_base_distro ? 'distrib' : 'updates')) || [] };
     require timezone;
     my $tz = ${timezone::read()}{timezone};
     foreach my $mirror (@mirrors) {
@@ -549,7 +549,7 @@ Is it ok to continue?");
 	: N("Please wait, downloading mirror addresses from the Mandriva website.")),
      @transient_options
     );
-    my @mirrors = eval { mirrors($urpm, $options{want_base_distro}, $options{arch}) };
+    my @mirrors = eval { mirrors($urpm, $options{want_base_distro}) };
     my $error = $@;
     remove_wait_msg($wait);
     if ($error) {