KCC: don't generate dot/verify graph edges unless necessary
authorDouglas Bagnall <douglas.bagnall@catalyst.net.nz>
Mon, 27 Apr 2015 23:27:57 +0000 (11:27 +1200)
committerAndrew Bartlett <abartlet@samba.org>
Fri, 12 Jun 2015 04:57:14 +0000 (06:57 +0200)
Signed-off-by: Douglas Bagnall <douglas.bagnall@catalyst.net.nz>
Reviewed-by: Garming Sam <garming@catalyst.net.nz>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
python/samba/kcc/__init__.py

index 6df42fe0adc3f7f1c1ec80b142d4c4e274698722..86051373479edb232789c1c2f8bb56ec9e66109f 100644 (file)
@@ -1158,16 +1158,17 @@ class KCC(object):
         g = setup_graph(part, self.site_table, self.transport_table,
                         self.sitelink_table, bridges_required)
 
-        dot_edges = []
-        for edge in g.edges:
-            for a, b in itertools.combinations(edge.vertices, 2):
-                dot_edges.append((a.site.site_dnstr, b.site.site_dnstr))
-        verify_properties = ()
-        verify_and_dot('site_edges', dot_edges, directed=False,
-                       label=self.my_dsa_dnstr,
-                       properties=verify_properties, debug=DEBUG,
-                       verify=self.verify,
-                       dot_files=self.dot_files)
+        if self.verify or self.dot_files:
+            dot_edges = []
+            for edge in g.edges:
+                for a, b in itertools.combinations(edge.vertices, 2):
+                    dot_edges.append((a.site.site_dnstr, b.site.site_dnstr))
+            verify_properties = ()
+            verify_and_dot('site_edges', dot_edges, directed=False,
+                           label=self.my_dsa_dnstr,
+                           properties=verify_properties, debug=DEBUG,
+                           verify=self.verify,
+                           dot_files=self.dot_files)
 
         return g