diff options
| author | Thierry Vignaud <tv@mandriva.org> | 2010-02-03 23:38:00 +0000 |
|---|---|---|
| committer | Thierry Vignaud <tv@mandriva.org> | 2010-02-03 23:38:00 +0000 |
| commit | dae8a3a9b97cedf4d4066239693da20aceba5f23 (patch) | |
| tree | 9729acb8780237a68b565faa30dd3c007c2dcb0d | |
| parent | 43809d04b01230a1db54d47b97d0154853871374 (diff) | |
| download | drakx-dae8a3a9b97cedf4d4066239693da20aceba5f23.tar drakx-dae8a3a9b97cedf4d4066239693da20aceba5f23.tar.gz drakx-dae8a3a9b97cedf4d4066239693da20aceba5f23.tar.bz2 drakx-dae8a3a9b97cedf4d4066239693da20aceba5f23.tar.xz drakx-dae8a3a9b97cedf4d4066239693da20aceba5f23.zip | |
(setupBootloader__general) make restrict's 'validate' callback more readable
| -rw-r--r-- | perl-install/any.pm | 8 | ||||
| -rw-r--r-- | perl-install/bootloader.pm | 2 |
2 files changed, 7 insertions, 3 deletions
diff --git a/perl-install/any.pm b/perl-install/any.pm index 492d8da4f..0a5df8811 100644 --- a/perl-install/any.pm +++ b/perl-install/any.pm @@ -427,8 +427,12 @@ sub setupBootloader__general { } }, { label => N("Password (again)"), val => \$b->{password2}, hidden => 1 }, { text => N("Restrict command line options"), val => \$b->{restricted}, type => "bool", - text => N("restrict"), advanced => 1 - validate => sub { my $ok = !$b->{restricted} || $b->{password} or $in->ask_warn('', N("Option ``Restrict command line options'' is of no use without a password")); $ok } }, + text => N("restrict"), advanced => 1, + validate => sub { + my $ok = !$b->{restricted} || $b->{password} + or $in->ask_warn('', N("Option ``Restrict command line options'' is of no use without a password")); + $ok; + } }, { text => N("Clean /tmp at each boot"), val => \$clean_tmp, type => 'bool', advanced => 1 }, ]) or return 0; } else { diff --git a/perl-install/bootloader.pm b/perl-install/bootloader.pm index 758d1d6b2..266df5ebd 100644 --- a/perl-install/bootloader.pm +++ b/perl-install/bootloader.pm @@ -1,6 +1,6 @@ package bootloader; # $Id$ -use diagnostics; +#use diagnostics; use strict; #-###################################################################################### |