summaryrefslogtreecommitdiffstats
path: root/perl-install/install_steps_gtk.pm
diff options
context:
space:
mode:
authorFrancois Pons <fpons@mandriva.com>2000-04-14 15:11:57 +0000
committerFrancois Pons <fpons@mandriva.com>2000-04-14 15:11:57 +0000
commit21066f8c4d8d136cca65f7138cabb25d4b4cfe8c (patch)
treee51a023cbbbdea6ad22b962dc4e573603c67f31a /perl-install/install_steps_gtk.pm
parent3f3ced984833bf1084447c1afd3cfc7d17d0838b (diff)
downloaddrakx-21066f8c4d8d136cca65f7138cabb25d4b4cfe8c.tar
drakx-21066f8c4d8d136cca65f7138cabb25d4b4cfe8c.tar.gz
drakx-21066f8c4d8d136cca65f7138cabb25d4b4cfe8c.tar.bz2
drakx-21066f8c4d8d136cca65f7138cabb25d4b4cfe8c.tar.xz
drakx-21066f8c4d8d136cca65f7138cabb25d4b4cfe8c.zip
*** empty log message ***
Diffstat (limited to 'perl-install/install_steps_gtk.pm')
-rw-r--r--perl-install/install_steps_gtk.pm17
1 files changed, 4 insertions, 13 deletions
diff --git a/perl-install/install_steps_gtk.pm b/perl-install/install_steps_gtk.pm
index e007303f1..1e6af32e0 100644
--- a/perl-install/install_steps_gtk.pm
+++ b/perl-install/install_steps_gtk.pm
@@ -542,23 +542,14 @@ sub installPackages {
undef *install_any::changeMedium;
*install_any::changeMedium = sub {
my ($method, $medium) = @_;
- my %medium_msg = ();
- $medium_msg{$medium} or $medium_msg{$medium} = _("Installation CD Nr %s", ($medium || 1));
- my %method_msg = (
- cdrom =>
+ my $msg =
_("Change your Cd-Rom!
Please insert the Cd-Rom labelled \"%s\" in your drive and press Ok when done.
-If you don't have it press Cancel to avoid installation from this Cd-Rom.", $medium_msg{$medium}),
- );
- $method_msg{$method} or $method_msg{$method} =
-_("Update installation image!
+If you don't have it press Cancel to avoid installation from this Cd-Rom.", pkgs::mediumDescr($packages, $medium));
-Ask your system administrator or reboot to update your installation image to include
-the Cd-Rom image labelled \"%s\". Press Ok if image has been updated or press Cancel
-to avoid installation from this Cd-Rom image.", $medium_msg{$medium});
-
- $o->ask_okcancel('', $method_msg{$method});
+ #- if not using a cdrom medium, always abort.
+ $method eq 'cdrom' && $o->ask_okcancel('', $msg);
};
catch_cdie { $o->install_steps::installPackages($packages); }
sub {