sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-01-11 05:18:09 +03:00
Code

kcc graph verifier: use __doc__ description for error explanation

Browse Source 
Signed-off-by: Douglas Bagnall <douglas.bagnall@catalyst.net.nz>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
This commit is contained in:
Douglas Bagnall 2018-05-15 14:40:36 +12:00 committed by Andrew Bartlett
parent 03bd7c20f0
commit e62cc29b47
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
python/samba/kcc/graph.py
View File

@ -188,7 +188,7 @@ def get_spanning_tree_edges(graph, my_site, label=None, verify=False,
properties=('complete', 'connected'))
if errors:
DEBUG('spanning tree edge set %s FAILED' % edgeType)
for p, e in errors:
for p, e, doc in errors:
DEBUG("%18s: %s" % (p, e))
raise KCCError("spanning tree failed")

8
python/samba/kcc/graph_utils.py
View File

@ -294,7 +294,7 @@ def verify_graph(edges, vertices=None, directed=False, properties=()):
try:
f(edges, vertices, edge_vertices)
except GraphError as e:
errors.append((p, e))
errors.append((p, e, f.__doc__))
return errors
@ -319,13 +319,13 @@ def verify_and_dot(basename, edges, vertices=None, label=None,
if errors:
title = '%s %s' % (basename, label or '')
debug(("%s%s%s FAILED:" % (MAGENTA, title, RED)))
for p, e in errors:
for p, e, doc in errors:
debug(" %18s: %s%s%s" % (p, DARK_YELLOW, e, RED))
if fatal:
raise GraphError("The '%s' graph lacks the following "
"properties:\n%s" %
(title, '\n'.join('%s: %s' % x
for x in errors)))
(title, '\n'.join('%s: %s' % (p, e)
for p, e, doc in errors)))
def list_verify_tests():