Fixed job entering/leaving search patterns in job tracing scripts.

Same as trunk r12530.

diff --git a/scripts/trace-master.pl b/scripts/trace-master.pl
index 11effd994f8fbb37fda88355e6bc1635644872f2..252d3f97ede911feeab99a847cec007581b3a81c 100755 (executable)
--- a/scripts/trace-master.pl
+++ b/scripts/trace-master.pl
@@ -27,8 +27,8 @@ my $inside = 0;
 my $entering;
 
 while (<STDIN>) {
-       $entering = $_ if !$inside && /\| entering\b/;
-       undef $entering if /\| leaving\b/;
+       $entering = $_ if !$inside && /[|:] entering\b/;
+       undef $entering if /[|:] leaving\b/;
 
        if (!$inside && /\bstatus in\b.*\b(?:async|job|icapx)(\d+)\b/o) {
                $inside = $1;
@@ -48,7 +48,7 @@ while (<STDIN>) {
                &linkJobs($inside, $1, $_);
        }
        
-       if (/\| leaving\b/) {
+       if (/[|:] leaving\b/) {
                $inside = 0;
        }
 }
@@ -158,6 +158,6 @@ sub reportJobHistory {
 
        foreach my $line (@lines) {
                print "$line\n";
-               print "\n" if $line =~ /\| leaving\b/;
+               print "\n" if $line =~ /[|:] leaving\b/;
        }
 }