[ovs-dev] [manager-options 1/5] configure: Fix Graphviz test and input generation.

Ethan Jackson ethan at nicira.com
Thu Nov 4 22:15:00 UTC 2010


Looks fine.

On Wed, Nov 3, 2010 at 10:39 AM, Ben Pfaff <blp at nicira.com> wrote:
> 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.
> ---
>  m4/openvswitch.m4  |    2 +-
>  ovsdb/ovsdb-dot.in |   12 +++++++-----
>  2 files changed, 8 insertions(+), 6 deletions(-)
>
> diff --git a/m4/openvswitch.m4 b/m4/openvswitch.m4
> index 5d77ca2..c5f0742 100644
> --- a/m4/openvswitch.m4
> +++ b/m4/openvswitch.m4
> @@ -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
> diff --git a/ovsdb/ovsdb-dot.in b/ovsdb/ovsdb-dot.in
> index 3a9d9b0..4569f2e 100755
> --- a/ovsdb/ovsdb-dot.in
> +++ b/ovsdb/ovsdb-dot.in
> @@ -1,6 +1,8 @@
>  #! @PYTHON@
>
>  from datetime import date
> +import ovs.db.error
> +import ovs.db.schema
>  import getopt
>  import os
>  import re
> @@ -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():
> @@ -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)
>
> --
> 1.7.1
>
>
> _______________________________________________
> dev mailing list
> dev at openvswitch.org
> http://openvswitch.org/mailman/listinfo/dev_openvswitch.org
>




More information about the dev mailing list