From 2fbde0cd3c722de33dbdb2e87c5a7d1378a7efb7 Mon Sep 17 00:00:00 2001 From: Oliver Tappe Date: Fri, 1 Feb 2008 19:32:40 +0000 Subject: * warnings are now indicated by '°°°', errors by '***' git-svn-id: http://svn.openslx.org/svn/openslx/trunk@1506 95ad53e4-c205-0410-b2fa-d234c58c8868 --- lib/OpenSLX/Basics.pm | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) (limited to 'lib') diff --git a/lib/OpenSLX/Basics.pm b/lib/OpenSLX/Basics.pm index e59a686f..5f9a57b4 100644 --- a/lib/OpenSLX/Basics.pm +++ b/lib/OpenSLX/Basics.pm @@ -383,7 +383,6 @@ sub slxsystem vlog(2, _tr("executing: %s", join ' ', @_)); my $res = system(@_); if ($res > 0) { - # check if child got killed, if so we stop, too (unless the signal is # SIGPIPE, which we ignore in order to loop over failed FTP connections # and the like): @@ -447,8 +446,15 @@ sub _doThrowOrWarn my $type = shift; my $msg = shift; - $msg =~ s[^\*\*\* ][]igms; - $msg =~ s[^][*** ]igms; + # use '°°°' for warnings and '***' for errors + if ($type eq 'carp' || $type eq 'warn' || $type eq 'cluck') { + $msg =~ s[^°°° ][]igms; + $msg =~ s[^][°°° ]igms; + } + else { + $msg =~ s[^\*\*\* ][]igms; + $msg =~ s[^][*** ]igms; + } if ($openslxConfig{'debug-confess'}) { my %functionFor = ( -- cgit v1.2.3-55-g7522