summaryrefslogtreecommitdiffstats
path: root/perl-install/any.pm
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2001-01-07 16:53:29 +0000
committerPascal Rigaux <pixel@mandriva.com>2001-01-07 16:53:29 +0000
commit597fbc897b288e62ddafaf38acf861bb8ff62f91 (patch)
tree8df4c9b284daf10ec2ca18bdc17d2a6069eb007d /perl-install/any.pm
parent363a685fd8eb8386e234d12fd6c591342d1060cd (diff)
downloaddrakx-597fbc897b288e62ddafaf38acf861bb8ff62f91.tar
drakx-597fbc897b288e62ddafaf38acf861bb8ff62f91.tar.gz
drakx-597fbc897b288e62ddafaf38acf861bb8ff62f91.tar.bz2
drakx-597fbc897b288e62ddafaf38acf861bb8ff62f91.tar.xz
drakx-597fbc897b288e62ddafaf38acf861bb8ff62f91.zip
update code for new ask_from_entries_refH which doesn't handle optional ok/cancel names in arg 1.
must be handled via ask_from_entries_refH_powered
Diffstat (limited to 'perl-install/any.pm')
-rw-r--r--perl-install/any.pm16
1 files changed, 9 insertions, 7 deletions
diff --git a/perl-install/any.pm b/perl-install/any.pm
index 184642794..fe9d05282 100644
--- a/perl-install/any.pm
+++ b/perl-install/any.pm
@@ -217,13 +217,15 @@ arch() !~ /sparc/ ? (
{ label => _("Default"), val => \$default, type => 'bool' },
);
- if ($in->ask_from_entries_refH($c eq "Add" ? '' : ['', _("Ok"), _("Remove entry")],
- '', \@l,
- complete => sub {
- $e->{label} or $in->ask_warn('', _("Empty label not allowed")), return 1;
- member($e->{label}, map { $_->{label} } grep { $_ != $e } @{$b->{entries}}) and $in->ask_warn('', _("This label is already used")), return 1;
- 0;
- })) {
+ if ($in->ask_from_entries_refH_powered(
+ {
+ if_($c ne "Add", cancel => _("Remove entry")),
+ callbacks => {
+ complete => sub {
+ $e->{label} or $in->ask_warn('', _("Empty label not allowed")), return 1;
+ member($e->{label}, map { $_->{label} } grep { $_ != $e } @{$b->{entries}}) and $in->ask_warn('', _("This label is already used")), return 1;
+ 0;
+ } } }, \@l)) {
$b->{default} = $old_default || $default ? $default && $e->{label} : $b->{default};
$e->{vga} = $bootloader::vga_modes{$e->{vga}} || $e->{vga};
require bootloader;