summaryrefslogtreecommitdiffstats
path: root/perl-install/any.pm
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2001-09-09 16:13:16 +0000
committerPascal Rigaux <pixel@mandriva.com>2001-09-09 16:13:16 +0000
commitbb4eb6bb98e98b33e83ba4ae934049a6f2cac4e0 (patch)
tree3e30a6715abc4926fe474dcd5940f81c11195f55 /perl-install/any.pm
parent7dd49ba305d4d26ca06904de3f39031596de571c (diff)
downloaddrakx-bb4eb6bb98e98b33e83ba4ae934049a6f2cac4e0.tar
drakx-bb4eb6bb98e98b33e83ba4ae934049a6f2cac4e0.tar.gz
drakx-bb4eb6bb98e98b33e83ba4ae934049a6f2cac4e0.tar.bz2
drakx-bb4eb6bb98e98b33e83ba4ae934049a6f2cac4e0.tar.xz
drakx-bb4eb6bb98e98b33e83ba4ae934049a6f2cac4e0.zip
clicked_may_quit used in place of clicked+exception to work-around perl-GTK bug (?)
Diffstat (limited to 'perl-install/any.pm')
-rw-r--r--perl-install/any.pm6
1 files changed, 3 insertions, 3 deletions
diff --git a/perl-install/any.pm b/perl-install/any.pm
index 02dfee4ce..e6660cfb7 100644
--- a/perl-install/any.pm
+++ b/perl-install/any.pm
@@ -206,7 +206,7 @@ sub setupBootloader {
while ($::expert || $more > 1) {
$in->set_help(arch() =~ /sparc/ ? 'setupSILOAddEntry' : arch() =~ /ppc/ ? 'setupYabootAddEntry' : 'setupBootloaderAddEntry') unless $::isStandalone;
my ($c, $e);
- eval { $in->ask_from_(
+ $in->ask_from_(
{
messages =>
_("Here are the different entries.
@@ -219,9 +219,9 @@ You can add some more or change the existing ones."),
"$e->{label} ($e->{kernel_or_dev})" . ($b->{default} eq $e->{label} && " *") :
translate($e);
}, list => [ @{$b->{entries}} ] },
- (map { my $s = $_; { val => translate($_), clicked => sub { $c = $s; die } } } (__("Modify"), __("Add"), __("Done"))),
+ (map { my $s = $_; { val => translate($_), clicked_may_quit => sub { $c = $s; 1 } } } (__("Modify"), __("Add"), __("Done"))),
]
- ) };
+ );
!$c || $c eq "Done" and last;
if ($c eq "Add") {