From 2a90638c1978c69b0d00120bf6a686a5ac3c186d Mon Sep 17 00:00:00 2001
From: Pascal Rigaux <pixel@mandriva.com>
Date: Sun, 16 Feb 2003 21:28:48 +0000
Subject: handle "not configured" in summary_prompt

---
 perl-install/install_steps_interactive.pm | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

(limited to 'perl-install/install_steps_interactive.pm')

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);
-- 
cgit v1.2.1