summaryrefslogtreecommitdiffstats
path: root/perl-install/install_steps_interactive.pm
diff options
context:
space:
mode:
authorFrancois Pons <fpons@mandriva.com>1999-10-18 17:26:46 +0000
committerFrancois Pons <fpons@mandriva.com>1999-10-18 17:26:46 +0000
commit914c6af22c2783359e593eb1a88bdbb7a1202da0 (patch)
tree872a256c20780d64c6b4d09dc32bd238bbb62a25 /perl-install/install_steps_interactive.pm
parent0e4f05d46881f2bb726eac3580ae783f62d45015 (diff)
downloaddrakx-914c6af22c2783359e593eb1a88bdbb7a1202da0.tar
drakx-914c6af22c2783359e593eb1a88bdbb7a1202da0.tar.gz
drakx-914c6af22c2783359e593eb1a88bdbb7a1202da0.tar.bz2
drakx-914c6af22c2783359e593eb1a88bdbb7a1202da0.tar.xz
drakx-914c6af22c2783359e593eb1a88bdbb7a1202da0.zip
*** empty log message ***
Diffstat (limited to 'perl-install/install_steps_interactive.pm')
-rw-r--r--perl-install/install_steps_interactive.pm3
1 files changed, 2 insertions, 1 deletions
diff --git a/perl-install/install_steps_interactive.pm b/perl-install/install_steps_interactive.pm
index 22ab2a0c9..545b58481 100644
--- a/perl-install/install_steps_interactive.pm
+++ b/perl-install/install_steps_interactive.pm
@@ -34,6 +34,7 @@ use lilo;
#-######################################################################################
sub errorInStep($$) {
my ($o, $err) = @_;
+ $err =~ s/(.*) at .*?$/$1\./ unless $::testing; #- avoid error message.
$o->ask_warn(_("Error"), [ _("An error occurred"), $err ]);
}
@@ -783,7 +784,7 @@ sub load_thiskind {
my ($o, $type) = @_;
my $w; #- needed to make the wait_message stay alive
my $pcmcia = $o->{pcmcia}
- unless $::expert && modules::pcmcia_need_config($o->{pcmcia}) &&
+ unless !$::beginner && modules::pcmcia_need_config($o->{pcmcia}) &&
$o->ask_yesorno('', _("Skip PCMCIA probing", 1));
$w = $o->wait_message(_("PCMCIA"), _("Configuring PCMCIA cards...")) if modules::pcmcia_need_config($pcmcia);
modules::load_thiskind($type, sub { $w = wait_load_module($o, $type, @_) }, $pcmcia);