summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2004-01-08 18:05:21 +0000
committerPascal Rigaux <pixel@mandriva.com>2004-01-08 18:05:21 +0000
commit50ff4c3265bbce6a78a01773143ab7554997661c (patch)
tree4631fbb3de39b7712c839a0aec7ba0ba2122c9a1
parent6887bb46366245ba10c35d907dc6a3f206d804b1 (diff)
downloaddrakx-50ff4c3265bbce6a78a01773143ab7554997661c.tar
drakx-50ff4c3265bbce6a78a01773143ab7554997661c.tar.gz
drakx-50ff4c3265bbce6a78a01773143ab7554997661c.tar.bz2
drakx-50ff4c3265bbce6a78a01773143ab7554997661c.tar.xz
drakx-50ff4c3265bbce6a78a01773143ab7554997661c.zip
better override formatError than replacing all the formatError with formatError_and_log
(goal: get log'ing even now that SIG{__DIE__} is not there anymore)
-rw-r--r--perl-install/common.pm7
1 files changed, 4 insertions, 3 deletions
diff --git a/perl-install/common.pm b/perl-install/common.pm
index 22282fa44..014aade79 100644
--- a/perl-install/common.pm
+++ b/perl-install/common.pm
@@ -9,7 +9,7 @@ use vars qw(@ISA @EXPORT $SECTORSIZE);
@ISA = qw(Exporter);
# no need to export ``_''
-@EXPORT = qw($SECTORSIZE N N_ check_for_xserver files_exist formatTime formatXiB makedev mandrake_release removeXiBSuffix require_root_capability salt setVirtual set_alternative set_permissions translate unmakedev untranslate formatError_and_log);
+@EXPORT = qw($SECTORSIZE N N_ check_for_xserver files_exist formatTime formatXiB makedev mandrake_release removeXiBSuffix require_root_capability salt setVirtual set_alternative set_permissions translate unmakedev untranslate);
# perl_checker: RE-EXPORT-ALL
push @EXPORT, @MDK::Common::EXPORT;
@@ -161,10 +161,11 @@ sub expand_symlinks_but_simple {
sub sync { &MDK::Common::System::sync }
-sub formatError_and_log {
+BEGIN { undef *formatError };
+sub formatError {
my ($err) = @_;
log::l("error: $err");
- formatError($err);
+ &MDK::Common::String::formatError($err);
}
# Group the list by n. Returns a reference of lists of length n