summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2001-04-13 14:08:41 +0000
committerPascal Rigaux <pixel@mandriva.com>2001-04-13 14:08:41 +0000
commit93adc5a588e86b2aa1ff09f30a5c47dd38dd590f (patch)
treee1b7df6c45bc3e76625b422f13a9747a4229ac02
parent9ab31aac1c348328dea21fb250401e3d773cce68 (diff)
downloaddrakx-backup-do-not-use-93adc5a588e86b2aa1ff09f30a5c47dd38dd590f.tar
drakx-backup-do-not-use-93adc5a588e86b2aa1ff09f30a5c47dd38dd590f.tar.gz
drakx-backup-do-not-use-93adc5a588e86b2aa1ff09f30a5c47dd38dd590f.tar.bz2
drakx-backup-do-not-use-93adc5a588e86b2aa1ff09f30a5c47dd38dd590f.tar.xz
drakx-backup-do-not-use-93adc5a588e86b2aa1ff09f30a5c47dd38dd590f.zip
(ask_from_entries_refH_powered_normalize): log the empty list instead of dying (for 8.0 only, should be switched back to die)
(ask_from_listf): display the backtrace when empty list
-rw-r--r--perl-install/interactive.pm7
1 files changed, 5 insertions, 2 deletions
diff --git a/perl-install/interactive.pm b/perl-install/interactive.pm
index 0ebe74434..c16e98d51 100644
--- a/perl-install/interactive.pm
+++ b/perl-install/interactive.pm
@@ -127,7 +127,7 @@ sub ask_from_listf_ {
}
sub ask_from_listf {
my ($o, $title, $message, $f, $l, $def, $help) = @_;
- @$l == 0 and die 'ask_from_list: empty list';
+ @$l == 0 and die "ask_from_list: empty list\n" . common::backtrace();
@$l == 1 and return $l->[0];
goto &ask_from_listf_no_check;
}
@@ -248,7 +248,10 @@ sub ask_from_entries_refH_powered_normalize {
#- don't display empty lists and one element lists
@$l = grep {
if ($_->{list} && $_->{not_edit}) {
- @{$_->{list}} == () and die 'ask_from_list: empty list';
+ if (@{$_->{list}} == ()) {
+ require log;
+ log::l("ask_from_entries_refH_powered_normalize: empty list\n" . common::backtrace());
+ }
@{$_->{list}} > 1;
} else {
1;