Skip to content
Snippets Groups Projects
Commit db09ad03 authored by Craig Tiller's avatar Craig Tiller Committed by GitHub
Browse files

Merge pull request #11829 from ctiller/mospam 

Fix spam
parents 8321cade 8a08400a
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
tools/mkowners/mkowners.py
+ 0
− 2
View file @ db09ad03
...@@ -164,7 +164,6 @@ def expand_directives(root, directives): ...@@ -164,7 +164,6 @@ def expand_directives(root, directives):
if intersect: if intersect:
for f in sorted(files_add): # sorted to ensure merge stability for f in sorted(files_add): # sorted to ensure merge stability
if f not in intersect: if f not in intersect:
print("X", root, glob_add, glob_have)
out_globs[os.path.relpath(f, start=root)] = who_add out_globs[os.path.relpath(f, start=root)] = who_add
for who in who_have: for who in who_have:
if who not in out_globs[glob_add]: if who not in out_globs[glob_add]:
...@@ -185,7 +184,6 @@ def add_parent_to_globs(parent, globs, globs_dir): ...@@ -185,7 +184,6 @@ def add_parent_to_globs(parent, globs, globs_dir):
if intersect: if intersect:
for f in sorted(files_child): # sorted to ensure merge stability for f in sorted(files_child): # sorted to ensure merge stability
if f not in intersect: if f not in intersect:
print("Y", full_dir(owners.dir, oglob), full_dir(globs_dir, gglob))
who = gglob_who_orig.copy() who = gglob_who_orig.copy()
globs[os.path.relpath(f, start=globs_dir)] = who globs[os.path.relpath(f, start=globs_dir)] = who
for who in oglob_who: for who in oglob_who:
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment