From: Ross Burton <ross.burton@intel.com>
Date: Fri, 12 Aug 2016 16:22:13 +0000 (+0100)
Subject: graph-tool: update to new networkx API, be iterative
X-Git-Tag: lucaceresoli/bug-15201-perf-libtraceevent-missing~24664
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c91898b07465fdd5f3629babb7ff9226454de24e;p=thirdparty%2Fopenembedded%2Fopenembedded-core-contrib.git

graph-tool: update to new networkx API, be iterative

Update the dot parser to the new networkx API (using pydotplus to parse).

Also, switch the path display to output the paths as they are found instead of
collecting them into a list, so output appears sooner.

Signed-off-by: Ross Burton <ross.burton@intel.com>
---

diff --git a/scripts/contrib/graph-tool b/scripts/contrib/graph-tool
index 0275fbd5c08..1df5b8c3459 100755
--- a/scripts/contrib/graph-tool
+++ b/scripts/contrib/graph-tool
@@ -30,8 +30,7 @@ def get_path_networkx(dotfile, fromnode, tonode):
         print('ERROR: Please install the networkx python module')
         sys.exit(1)
 
-    graph = networkx.DiGraph(networkx.read_dot(dotfile))
-
+    graph = networkx.DiGraph(networkx.nx_pydot.read_dot(dotfile))
     def node_missing(node):
         import difflib
         close_matches = difflib.get_close_matches(node, graph.nodes(), cutoff=0.7)
@@ -53,11 +52,11 @@ def find_paths(args, usage):
 
     fromnode = args[1]
     tonode = args[2]
-    paths = list(get_path_networkx(args[0], fromnode, tonode))
-    if paths:
-        for path in paths:
-            print(" -> ".join(map(str,path)))
-    else:
+
+    path = None
+    for path in get_path_networkx(args[0], fromnode, tonode):
+        print(" -> ".join(map(str, path)))
+    if not path:
         print("ERROR: no path from %s to %s in graph" % (fromnode, tonode))
         sys.exit(1)