diff options
| author | Pascal Rigaux <pixel@mandriva.com> | 2002-12-04 17:40:03 +0000 |
|---|---|---|
| committer | Pascal Rigaux <pixel@mandriva.com> | 2002-12-04 17:40:03 +0000 |
| commit | 3383b75cf59ce2f84f42bcc52fd9466c622aa056 (patch) | |
| tree | 7a31471ff6fd8932e3ad513b0181c67be7928a33 /perl-install | |
| parent | 517fc0730e017fb9b231b575f29da8d81bf1de7f (diff) | |
| download | drakx-3383b75cf59ce2f84f42bcc52fd9466c622aa056.tar drakx-3383b75cf59ce2f84f42bcc52fd9466c622aa056.tar.gz drakx-3383b75cf59ce2f84f42bcc52fd9466c622aa056.tar.bz2 drakx-3383b75cf59ce2f84f42bcc52fd9466c622aa056.tar.xz drakx-3383b75cf59ce2f84f42bcc52fd9466c622aa056.zip | |
"require log" causes some pb, perl thinking that "log" is the log() function. So replace it with require 'log.pm' (perl_checker will handle this)
Diffstat (limited to 'perl-install')
| -rw-r--r-- | perl-install/interactive.pm | 4 | ||||
| -rw-r--r-- | perl-install/standalone.pm | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/perl-install/interactive.pm b/perl-install/interactive.pm index acd33624c..457abca2a 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; + require 'log.pm'; #- "require log" causes some pb, perl thinking that "log" is the log() function undef *log::l; *log::l = sub {}; # otherwise, it will bother us :( require interactive::newt; @@ -302,7 +302,7 @@ sub ask_from_normalize { if ($_->{list} && $_->{not_edit} && !$_->{allow_empty_list}) { if (@{$_->{list}} == ()) { eval { - require log; + require 'log.pm'; #- "require log" causes some pb, perl thinking that "log" is the log() function log::l("ask_from_normalize: empty list for $_->{label}\n" . backtrace()); }; } diff --git a/perl-install/standalone.pm b/perl-install/standalone.pm index 36807d1af..0a2230ca3 100644 --- a/perl-install/standalone.pm +++ b/perl-install/standalone.pm @@ -7,7 +7,7 @@ use Config; #- for sanity (if a use standalone is made during install, MANY problems will happen) if ($::isInstall) { - require log; + require 'log.pm'; #- "require log" causes some pb, perl thinking that "log" is the log() function log::l('ERROR: use standalone made during install :-('); require common; log::l('backtrace: ' . backtrace()); |