aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThierry Vignaud <tv@mandriva.org>2007-03-22 13:04:11 +0000
committerThierry Vignaud <tv@mandriva.org>2007-03-22 13:04:11 +0000
commitcea22e6dace99bad88ffdf988a24c514551d9e42 (patch)
tree62b5f8de865fd60a1885b886b6c2948e4196d968
parente7fb042cea01027a8ae672f04d03545bb5df191c (diff)
downloadrpmdrake-cea22e6dace99bad88ffdf988a24c514551d9e42.tar
rpmdrake-cea22e6dace99bad88ffdf988a24c514551d9e42.tar.gz
rpmdrake-cea22e6dace99bad88ffdf988a24c514551d9e42.tar.bz2
rpmdrake-cea22e6dace99bad88ffdf988a24c514551d9e42.tar.xz
rpmdrake-cea22e6dace99bad88ffdf988a24c514551d9e42.zip
(easy_add_callback) display the right arch when selecting ia32 media
on x86_64 (side effect of #28409)
-rwxr-xr-xRpmdrake/edit_urpm_sources.pm5
1 files changed, 4 insertions, 1 deletions
diff --git a/Rpmdrake/edit_urpm_sources.pm b/Rpmdrake/edit_urpm_sources.pm
index 73bd2769..683946f4 100755
--- a/Rpmdrake/edit_urpm_sources.pm
+++ b/Rpmdrake/edit_urpm_sources.pm
@@ -90,6 +90,9 @@ to do this in two steps.)"),
),
yesno => 1, text => { yes => N("Distribution sources"), no => N("Official updates") },
) : 1;
+ my $distro = $rpmdrake::mandrake_release;
+ my $real_arch = arch();
+ $distro =~ s/$real_arch/$arch/;
my ($mirror) = choose_mirror(message =>
N("This will attempt to install all official sources corresponding to your
distribution (%s).
@@ -97,7 +100,7 @@ distribution (%s).
I need to contact the Mandriva website to get the mirror list.
Please check that your network is currently running.
-Is it ok to continue?", $rpmdrake::mandrake_release),
+Is it ok to continue?", $distro),
want_base_distro => $want_base_distro,
transient => $::main_window,
arch => $arch,