Skip to content

Commit

Permalink
configure: Fix Graphviz test and input generation.
Browse files Browse the repository at this point in the history
This check for Graphviz never actually worked properly because Autoconf
swallows up the [] around [gG], so Graphviz was always detected as missing.
This commit fixes the problem by doubling up to [[gG]].

Because Graphviz was never used, I never noticed that ovsdb-dot had not
been revised to use the latest Python interface to OVSDB, so this commit
fixes up those problems too.
  • Loading branch information
blp committed Nov 5, 2010
1 parent 6d6c725 commit a5eef57
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 6 deletions.
2 changes: 1 addition & 1 deletion m4/openvswitch.m4
Original file line number Diff line number Diff line change
Expand Up @@ -198,7 +198,7 @@ AC_DEFUN([OVS_CHECK_DOT],
[for dot],
[ovs_cv_dot],
[dnl "dot" writes -V output to stderr:
if (dot -V) 2>&1 | grep '^dot - [gG]raphviz version' >/dev/null 2>&1; then
if (dot -V) 2>&1 | grep '^dot - [[gG]]raphviz version' >/dev/null 2>&1; then
ovs_cv_dot=yes
else
ovs_cv_dot=no
Expand Down
12 changes: 7 additions & 5 deletions ovsdb/ovsdb-dot.in
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
#! @PYTHON@

from datetime import date
import ovs.db.error
import ovs.db.schema
import getopt
import os
import re
Expand All @@ -9,18 +11,18 @@ import sys
argv0 = sys.argv[0]

def printEdge(tableName, baseType, label):
if baseType.refTable:
if baseType.ref_table:
options = {}
options['label'] = '"%s"' % label
if baseType.refType == 'weak':
if baseType.ref_type == 'weak':
options['constraint'] = 'false'
print "\t%s -> %s [%s];" % (
tableName,
baseType.refTable,
baseType.ref_table,
', '.join(['%s=%s' % (k,v) for k,v in options.items()]))

def schemaToDot(schemaFile):
schema = DbSchema.fromJson(ovs.json.from_file(schemaFile))
schema = ovs.db.schema.DbSchema.from_json(ovs.json.from_file(schemaFile))

print "digraph %s {" % schema.name
for tableName, table in schema.tables.iteritems():
Expand Down Expand Up @@ -73,7 +75,7 @@ if __name__ == "__main__":

schemaToDot(args[0])

except Error, e:
except ovs.db.error.Error, e:
sys.stderr.write("%s: %s\n" % (argv0, e.msg))
sys.exit(1)

Expand Down

0 comments on commit a5eef57

Please sign in to comment.