From 647bfb356ac30436fd7f77d90ce44b9d82e8d9dd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mateusz=20Zi=C4=99ba?= Date: Tue, 13 Apr 2021 12:33:42 -0700 Subject: [PATCH] Fix bug: include all dirs not just the last one. Test: m all Bug: 179023362 Change-Id: I5724f792ee36c2f66786761e5d55b4f6c456753c Merged-in: I5724f792ee36c2f66786761e5d55b4f6c456753c --- tools/generate-notice-files.py | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/tools/generate-notice-files.py b/tools/generate-notice-files.py index 18f2166fbd..bf958fbae4 100755 --- a/tools/generate-notice-files.py +++ b/tools/generate-notice-files.py @@ -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: