Merge "Fix bug: include all dirs not just the last one."

This commit is contained in:
Bob Badour 2021-04-14 00:16:12 +00:00 committed by Gerrit Code Review
commit f7e9c43464

View file

@ -231,8 +231,8 @@ def main(argv):
input_dirs = [os.path.normpath(source_dir) for source_dir in args.source_dir]
# Find all the notice files and md5 them
files_with_same_hash = defaultdict(list)
for input_dir in input_dirs:
files_with_same_hash = defaultdict(list)
for root, dir, files in os.walk(input_dir):
for file in files:
matched = True
@ -254,8 +254,7 @@ def main(argv):
file_md5sum = md5sum(filename)
files_with_same_hash[file_md5sum].append(filename)
filesets = [sorted(files_with_same_hash[md5]) for md5 in sorted(files_with_same_hash.keys())]
filesets = [sorted(files_with_same_hash[md5]) for md5 in sorted(files_with_same_hash.keys())]
combine_notice_files_text(filesets, input_dirs, txt_output_file, file_title)
if html_output_file is not None: