Changeset 30370

Timestamp:

Jan 25, 2011, 3:58:45 PM (15 years ago)

Author:

rhenders

Message:

dealing with inconsistant way pantasks_client prints output of 'show.labels'

File:

• trunk/tools/czartool/Pantasks.pm (modified) (1 diff)

trunk/tools/czartool/Pantasks.pm

@@ -120 +120 @@
         chomp($line);
         if (!$self->outputOk($line)) {return \@labels;}
-        if ($line =~ m/pantasks:\s+/) {$passedHeader=1; next;}
+
+        # sometimes a label can be on the same line as the panstasks prompt
+        if ($line =~ m/pantasks: (.*)/) {
+            if (length($1) > 0) {push(@labels, $1);}
+            $passedHeader=1; next;
+        }
         if ($passedHeader) {push(@labels, $line);}
     }