From 73ffb8e8c0c8dd5a07195827ca97f641faccc49f Mon Sep 17 00:00:00 2001 From: Ben Pfaff Date: Wed, 1 Dec 2010 11:03:12 -0800 Subject: [PATCH] dot2pic: Be less picky parsing "dot" output. Some versions of "dot" put two spaces after the "node" keyword instead of one, which didn't match the regular expression used in dot2pic. This commit changes dot2pic not to care about the number of spaces in "node" and "graph" lines. (The "graph" lines weren't actually a problem but I don't see a reason to be picky about them either.) Different versions of "dot" still produce different output for the same input, but I don't see how to avoid that. Reported-by: Justin Pettit --- ovsdb/dot2pic | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/ovsdb/dot2pic b/ovsdb/dot2pic index 3e2f30893..caca9f8d0 100755 --- a/ovsdb/dot2pic +++ b/ovsdb/dot2pic @@ -21,9 +21,10 @@ my ($scale) = 1; print ".PS\n"; print "linethick = 1;\n"; while (<>) { - if (/graph (\S+) (\S+) (\S+)/) { - $scale = $1; - } elsif (my ($name, $x, $y, $width, $height, $label, $style, $shape, $color, $fillcolor) = /node (\S+) (\S+) (\S+) (\S+) (\S+) (\S+) (\S+) (\S+) (\S+) (\S+)/) { + if (/^graph/) { + (undef, $scale) = split; + } elsif (/^node/) { + my (undef, $name, $x, $y, $width, $height, $label, $style, $shape, $color, $fillcolor) = split; $x *= $scale; $y *= $scale; $width *= $scale; -- 2.43.0