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

KCC: some rearrangement in kcc.graph.add_int_edge()

Browse Source 
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>
This commit is contained in:
Douglas Bagnall 2015-05-08 12:26:00 +12:00 committed by Andrew Bartlett
parent 6c760c1a0d
commit f019fea947
1 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -531,13 +531,11 @@ def add_int_edge(graph, internal_edges, examine, v1, v2):
root1 = v1.root root1 = v1.root
root2 = v2.root root2 = v2.root
red_red = False red_red = root1.is_red() and root2.is_red()
if root1.is_red() and root2.is_red():
red_red = True
if red_red: if red_red:
if ((examine.con_type not in root1.accept_red_red if (examine.con_type not in root1.accept_red_red
or examine.con_type not in root2.accept_red_red)): or examine.con_type not in root2.accept_red_red):
return return
elif (examine.con_type not in root1.accept_black elif (examine.con_type not in root1.accept_black
or examine.con_type not in root2.accept_black): or examine.con_type not in root2.accept_black):
@ -553,12 +551,12 @@ def add_int_edge(graph, internal_edges, examine, v1, v2):
if not combine_repl_info(ri, examine.repl_info, ri2): if not combine_repl_info(ri, examine.repl_info, ri2):
return return
# Order by vertex guid
if root1.ndrpacked_guid > root2.ndrpacked_guid:
root1, root2 = root2, root1
newIntEdge = InternalEdge(root1, root2, red_red, ri2, examine.con_type, newIntEdge = InternalEdge(root1, root2, red_red, ri2, examine.con_type,
examine.site_link) examine.site_link)
# Order by vertex guid
if newIntEdge.v1.ndrpacked_guid > newIntEdge.v2.ndrpacked_guid:
newIntEdge.v1 = root2
newIntEdge.v2 = root1
internal_edges.add(newIntEdge) internal_edges.add(newIntEdge)