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

diff --git a/gui/bweb/lib/Bweb.pm b/gui/bweb/lib/Bweb.pm
index feda60e30dd6812a955cc0caa265308ea572825e..12c740afd230b07ce5b207c4c4c945c6fae6569b 100644 (file)
--- 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 d78012a61abbbf65d6517fc0b856b85d00a1b47e..ed3c44c679a65c92e950d2e104469ab5329c846e 100644 (file)
--- 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