summaryrefslogtreecommitdiffstats
path: root/perl-install/interactive.pm
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2002-11-27 20:50:12 +0000
committerPascal Rigaux <pixel@mandriva.com>2002-11-27 20:50:12 +0000
commitb0d554c4155060ed665844fdf7b2a08db9bb3356 (patch)
treed1236029c2ac147b49a2da74bf132c3f56619406 /perl-install/interactive.pm
parentc2b148e1e94892d8d72000ed087b607ae28b5808 (diff)
downloaddrakx-b0d554c4155060ed665844fdf7b2a08db9bb3356.tar
drakx-b0d554c4155060ed665844fdf7b2a08db9bb3356.tar.gz
drakx-b0d554c4155060ed665844fdf7b2a08db9bb3356.tar.bz2
drakx-b0d554c4155060ed665844fdf7b2a08db9bb3356.tar.xz
drakx-b0d554c4155060ed665844fdf7b2a08db9bb3356.zip
perl_checker adaptations
Diffstat (limited to 'perl-install/interactive.pm')
-rw-r--r--perl-install/interactive.pm6
1 files changed, 3 insertions, 3 deletions
diff --git a/perl-install/interactive.pm b/perl-install/interactive.pm
index 9df2d82f3..acd33624c 100644
--- a/perl-install/interactive.pm
+++ b/perl-install/interactive.pm
@@ -104,7 +104,7 @@ sub vnew {
if ($su && $>) {
die "you must be root to run this program";
}
- require 'log.pm';
+ require log;
undef *log::l;
*log::l = sub {}; # otherwise, it will bother us :(
require interactive::newt;
@@ -276,7 +276,7 @@ sub ask_from_normalize {
$e->{type} ||= 'combo';
if (!$e->{not_edit}) {
- die q(when using "not_edit" you must use strings, not a data structure) if ref ${$e->{val}} || grep { ref } @$li;
+ die q(when using "not_edit" you must use strings, not a data structure) if ref ${$e->{val}} || grep { ref $_ } @$li;
}
if ($e->{type} ne 'combo' || $e->{not_edit}) {
${$e->{val}} = $li->[0] if !member(may_apply($e->{format}, ${$e->{val}}), map { may_apply($e->{format}, $_) } @$li);
@@ -302,7 +302,7 @@ sub ask_from_normalize {
if ($_->{list} && $_->{not_edit} && !$_->{allow_empty_list}) {
if (@{$_->{list}} == ()) {
eval {
- require 'log.pm';
+ require log;
log::l("ask_from_normalize: empty list for $_->{label}\n" . backtrace());
};
}