summaryrefslogtreecommitdiffstats
path: root/perl-install/Xconfigurator.pm
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>1999-11-12 01:24:39 +0000
committerPascal Rigaux <pixel@mandriva.com>1999-11-12 01:24:39 +0000
commit7d8f11b58764859230367055deda3489fc09412f (patch)
tree6961a38d59d54670c8e1d942dbef44449c18a9c1 /perl-install/Xconfigurator.pm
parent855cc85f5558115010b9629246b014b83fcfe2c3 (diff)
downloaddrakx-7d8f11b58764859230367055deda3489fc09412f.tar
drakx-7d8f11b58764859230367055deda3489fc09412f.tar.gz
drakx-7d8f11b58764859230367055deda3489fc09412f.tar.bz2
drakx-7d8f11b58764859230367055deda3489fc09412f.tar.xz
drakx-7d8f11b58764859230367055deda3489fc09412f.zip
no_comment
Diffstat (limited to 'perl-install/Xconfigurator.pm')
-rw-r--r--perl-install/Xconfigurator.pm8
1 files changed, 5 insertions, 3 deletions
diff --git a/perl-install/Xconfigurator.pm b/perl-install/Xconfigurator.pm
index 16520e10f..6ba3014b7 100644
--- a/perl-install/Xconfigurator.pm
+++ b/perl-install/Xconfigurator.pm
@@ -726,7 +726,7 @@ sub main {
}
my $ok = resolutionsConfiguration($o, auto => $::auto, noauto => $::noauto);
- $ok &&= testFinalConfig($o, $::auto);
+ $ok &&= testFinalConfig($o, $::auto) unless $::skiptest;
my $quit;
until ($ok || $quit) {
@@ -743,9 +743,11 @@ sub main {
__("Test again") => sub { $ok = testFinalConfig($o, 1) },
__("Quit") => sub { $quit = 1 },
);
- &{$c{$in->ask_from_list_([''],
+ my $f = $in->ask_from_list_([''],
_("What do you want to do?"),
- [ grep { !ref } @c ])}};
+ [ grep { !ref } @c ]);
+ eval { &{$c{$f}} };
+ $@ =~ /^ask_from_list cancel/ or die;
}
if ($ok) {