summaryrefslogtreecommitdiffstats
path: root/perl-install/any.pm
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2001-02-20 01:09:07 +0000
committerPascal Rigaux <pixel@mandriva.com>2001-02-20 01:09:07 +0000
commit1d27dbf5e28c61be9eeb078c44f2481fb25e7195 (patch)
tree2ad14181e14cca6244b53fa2c6856e5d17fd8d8d /perl-install/any.pm
parenta7463f88ccd1e833fcecec5c76ac47c804e060c0 (diff)
downloaddrakx-1d27dbf5e28c61be9eeb078c44f2481fb25e7195.tar
drakx-1d27dbf5e28c61be9eeb078c44f2481fb25e7195.tar.gz
drakx-1d27dbf5e28c61be9eeb078c44f2481fb25e7195.tar.bz2
drakx-1d27dbf5e28c61be9eeb078c44f2481fb25e7195.tar.xz
drakx-1d27dbf5e28c61be9eeb078c44f2481fb25e7195.zip
major move. now ask_from_list returns false when canceled (it doesn't die 'ask_from_list canceled' anymore)
Diffstat (limited to 'perl-install/any.pm')
-rw-r--r--perl-install/any.pm18
1 files changed, 11 insertions, 7 deletions
diff --git a/perl-install/any.pm b/perl-install/any.pm
index 2b65ca7c4..6ea56b645 100644
--- a/perl-install/any.pm
+++ b/perl-install/any.pm
@@ -101,7 +101,7 @@ sub setupBootloader {
if (arch() =~ /sparc/) {
$b->{use_partition} = $in->ask_from_list_(_("SILO Installation"),
_("Where do you want to install the bootloader?"),
- \@l, $l[$b->{use_partition}]);
+ \@l, $l[$b->{use_partition}]) or return;
} else {
my $boot = $hds->[0]{device};
my $onmbr = "/dev/$boot" eq $b->{boot};
@@ -169,17 +169,21 @@ sub setupBootloader {
while ($::expert || $more > 1) {
$in->set_help(arch() =~ /sparc/ ? 'setupSILOAddEntry' : 'setupBootloaderAddEntry') unless $::isStandalone;
- my $c = $in->ask_from_listf([''],
+ my $c;
+ $in->ask_from_entries_refH_powered(
+ {
+ messages =>
_("Here are the different entries.
You can add some more or change the existing ones."),
- sub {
+ ok => '',
+},
+ [ { val => \$c, format => sub {
my ($e) = @_;
ref $e ?
"$e->{label} ($e->{kernel_or_dev})" . ($b->{default} eq $e->{label} && " *") :
translate($e);
- },
- [ @{$b->{entries}}, __("Add"), __("Done") ]);
-
+ }, list => [ @{$b->{entries}}, __("Add"), __("Done") ] } ]
+ );
$c eq "Done" and last;
my ($e);
@@ -553,7 +557,7 @@ sub setup_thiskind {
my $opt = [ __("Yes"), __("No") ];
push @$opt, __("See hardware info") if $::expert;
my $r = "Yes";
- $r = $in->ask_from_list_('', $msg, $opt, "No") unless $at_least_one && @l == 0;
+ $r = $in->ask_from_list_('', $msg, $opt, "No") || die 'already displayed' unless $at_least_one && @l == 0;
if ($r eq "No") { return @l }
if ($r eq "Yes") {
push @l, load_module($in, $type) || next;