diff options
author | Pascal Rigaux <pixel@mandriva.com> | 2003-02-16 21:28:48 +0000 |
---|---|---|
committer | Pascal Rigaux <pixel@mandriva.com> | 2003-02-16 21:28:48 +0000 |
commit | 2a90638c1978c69b0d00120bf6a686a5ac3c186d (patch) | |
tree | ff72bc78934196b66ef9aff6e6da675a3e094be5 /perl-install | |
parent | 8c847f02b2ff79db0f8ecc0a3041d964f0658c37 (diff) | |
download | drakx-backup-do-not-use-2a90638c1978c69b0d00120bf6a686a5ac3c186d.tar drakx-backup-do-not-use-2a90638c1978c69b0d00120bf6a686a5ac3c186d.tar.gz drakx-backup-do-not-use-2a90638c1978c69b0d00120bf6a686a5ac3c186d.tar.bz2 drakx-backup-do-not-use-2a90638c1978c69b0d00120bf6a686a5ac3c186d.tar.xz drakx-backup-do-not-use-2a90638c1978c69b0d00120bf6a686a5ac3c186d.zip |
handle "not configured" in summary_prompt
Diffstat (limited to 'perl-install')
-rw-r--r-- | perl-install/install_steps_interactive.pm | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/perl-install/install_steps_interactive.pm b/perl-install/install_steps_interactive.pm index d7152f24b..2c367a3af 100644 --- a/perl-install/install_steps_interactive.pm +++ b/perl-install/install_steps_interactive.pm @@ -832,7 +832,10 @@ sub summaryBefore { sub summary_prompt { my ($o, $l, $check_complete) = @_; - ($_->{format}, $_->{val}) = ($_->{val}, '') foreach @$l; + foreach (@$l) { + my $val = $_->{val}; + ($_->{format}, $_->{val}) = (sub { $val->() || N("not configured") }, ''); + } $o->ask_from_({ messages => N("Summary"), @@ -948,14 +951,14 @@ sub summary { push @l, { group => N("Hardware"), label => N("Graphical interface"), - val => sub { $o->{raw_X} ? Xconfig::various::to_string($o->{raw_X}) : N("not configured") }, + val => sub { $o->{raw_X} ? Xconfig::various::to_string($o->{raw_X}) : '' }, clicked => sub { configureX($o, 'expert') }, }; push @l, { group => N("Network & Internet"), label => N("Network"), - val => sub { $o->{netcnx}{type} || N("not configured") }, + val => sub { $o->{netcnx}{type} }, clicked => sub { require network::netconnect; network::netconnect::main($o->{prefix}, $o->{netcnx} ||= {}, $o->{netc}, $o->{mouse}, $o, $o->{intf}, 0, 0, 1); |