summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFrancois Pons <fpons@mandriva.com>2000-04-20 11:34:52 +0000
committerFrancois Pons <fpons@mandriva.com>2000-04-20 11:34:52 +0000
commit635c590d21ca7bf878aa1d3a60bce36020e79f94 (patch)
tree9e1ab9ac094f189a5fa389ed89d74a5c3f3230ad
parenta098b07c6f1e330df9e098cbea8237e1f9b4abd4 (diff)
downloaddrakx-635c590d21ca7bf878aa1d3a60bce36020e79f94.tar
drakx-635c590d21ca7bf878aa1d3a60bce36020e79f94.tar.gz
drakx-635c590d21ca7bf878aa1d3a60bce36020e79f94.tar.bz2
drakx-635c590d21ca7bf878aa1d3a60bce36020e79f94.tar.xz
drakx-635c590d21ca7bf878aa1d3a60bce36020e79f94.zip
*** empty log message ***
-rw-r--r--perl-install/install_any.pm2
-rw-r--r--perl-install/install_steps_gtk.pm2
2 files changed, 2 insertions, 2 deletions
diff --git a/perl-install/install_any.pm b/perl-install/install_any.pm
index 824465c9e..2799ff252 100644
--- a/perl-install/install_any.pm
+++ b/perl-install/install_any.pm
@@ -46,7 +46,7 @@ my $asked_medium = 1;
sub useMedium($) {
#- before ejecting the first CD, there are some files to copy!
#- does nothing if the function has already been called.
- $_[0] and $::o->{method} eq 'cdrom' and setup_postinstall_rpms($::o->{prefix}, $::o->{packages});
+ $_[0] > 1 and $::o->{method} eq 'cdrom' and setup_postinstall_rpms($::o->{prefix}, $::o->{packages});
$asked_medium eq $_[0] or log::l("selecting new medium '$_[0]'");
$asked_medium = $_[0];
diff --git a/perl-install/install_steps_gtk.pm b/perl-install/install_steps_gtk.pm
index 1b25eb969..0078ec6a1 100644
--- a/perl-install/install_steps_gtk.pm
+++ b/perl-install/install_steps_gtk.pm
@@ -572,7 +572,7 @@ sub installPackages {
_("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.", pkgs::mediumDescr($packages, $medium));
+If you don't have it, press Cancel to avoid installation from this Cd-Rom.", pkgs::mediumDescr($o->{packages}, $medium));
#- if not using a cdrom medium, always abort.
$method eq 'cdrom' && $o->ask_okcancel('', $msg);