From 28ce86ec9575ed2167ec24ccf948dc87133d6bbe Mon Sep 17 00:00:00 2001 From: Eric Bollengier Date: Fri, 27 Feb 2009 14:17:25 +0000 Subject: [PATCH] ebl Should fix #1240 about job output parsing git-svn-id: https://bacula.svn.sourceforge.net/svnroot/bacula/trunk@8494 91ce42f0-d328-0410-95d8-f526ca767f89 --- gui/bweb/lib/Bweb.pm | 3 +-- gui/bweb/technotes-3.0 | 2 ++ 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/gui/bweb/lib/Bweb.pm b/gui/bweb/lib/Bweb.pm index feda60e30d..12c740afd2 100644 --- a/gui/bweb/lib/Bweb.pm +++ b/gui/bweb/lib/Bweb.pm @@ -4876,7 +4876,7 @@ sub run_parse_job my ($self, $ouput) = @_; my %arg; - foreach my $l (split(/\r\n/, $ouput)) { + foreach my $l (split(/\r?\n/, $ouput)) { if ($l =~ /(\w+): name=([\w\d\.\s-]+?)(\s+\w+=.+)?$/) { $arg{$1} = $2; $l = $3 @@ -4892,7 +4892,6 @@ sub run_parse_job foreach my $k (keys %arg) { $lowcase{lc($k)} = $arg{$k} ; } - return \%lowcase; } diff --git a/gui/bweb/technotes-3.0 b/gui/bweb/technotes-3.0 index d78012a61a..ed3c44c679 100644 --- a/gui/bweb/technotes-3.0 +++ b/gui/bweb/technotes-3.0 @@ -1,3 +1,5 @@ +27Feb09 +ebl Should fix #1240 about job output parsing 04Feb09 ebl Fix new Purged status from update_media 03Feb09 -- 2.39.5