summaryrefslogtreecommitdiffstats
path: root/perl-install/interactive.pm
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2001-03-23 16:24:03 +0000
committerPascal Rigaux <pixel@mandriva.com>2001-03-23 16:24:03 +0000
commitb1ea745924ed2ff06f2d5e36782e8399f0b2d9d0 (patch)
tree05504662c77932e1ca982e79dfc3ea89bd933855 /perl-install/interactive.pm
parent12f60f7718cd07ff5fa550da97b14c9a84f259df (diff)
downloaddrakx-b1ea745924ed2ff06f2d5e36782e8399f0b2d9d0.tar
drakx-b1ea745924ed2ff06f2d5e36782e8399f0b2d9d0.tar.gz
drakx-b1ea745924ed2ff06f2d5e36782e8399f0b2d9d0.tar.bz2
drakx-b1ea745924ed2ff06f2d5e36782e8399f0b2d9d0.tar.xz
drakx-b1ea745924ed2ff06f2d5e36782e8399f0b2d9d0.zip
(ask_from_listf_no_check): fix the bad fix
Diffstat (limited to 'perl-install/interactive.pm')
-rw-r--r--perl-install/interactive.pm3
1 files changed, 2 insertions, 1 deletions
diff --git a/perl-install/interactive.pm b/perl-install/interactive.pm
index f82c2604e..708538eb2 100644
--- a/perl-install/interactive.pm
+++ b/perl-install/interactive.pm
@@ -142,7 +142,8 @@ sub ask_from_listf_no_check {
if_($l->[1], cancel => may_apply($f, $l->[1]), focus_cancel => $def eq $l->[1]) }, []
) ? $l->[0] : $l->[1];
};
- $@ ? $@ =~ /^wizcancel/ : ($@ ? die : $ret);
+ $@ && $@ =~ /^wizcancel/ or die;
+ $@ ? undef : $ref;
} else {
ask_from_entries_refH($o, $title, $message, [ { val => \$def, type => 'list', list => $l, help => $help, format => $f } ]) && $def;
}