Merge "Fix bug: include all dirs not just the last one."
This commit is contained in:
commit
f7e9c43464
|
@ -231,8 +231,8 @@ def main(argv):
|
||||||
|
|
||||||
input_dirs = [os.path.normpath(source_dir) for source_dir in args.source_dir]
|
input_dirs = [os.path.normpath(source_dir) for source_dir in args.source_dir]
|
||||||
# Find all the notice files and md5 them
|
# Find all the notice files and md5 them
|
||||||
for input_dir in input_dirs:
|
|
||||||
files_with_same_hash = defaultdict(list)
|
files_with_same_hash = defaultdict(list)
|
||||||
|
for input_dir in input_dirs:
|
||||||
for root, dir, files in os.walk(input_dir):
|
for root, dir, files in os.walk(input_dir):
|
||||||
for file in files:
|
for file in files:
|
||||||
matched = True
|
matched = True
|
||||||
|
@ -255,7 +255,6 @@ def main(argv):
|
||||||
files_with_same_hash[file_md5sum].append(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)
|
combine_notice_files_text(filesets, input_dirs, txt_output_file, file_title)
|
||||||
|
|
||||||
if html_output_file is not None:
|
if html_output_file is not None:
|
||||||
|
|
Loading…
Reference in New Issue