aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTreehugger Robot <treehugger-gerrit@google.com>2021-04-30 18:23:28 +0000
committerGerrit Code Review <noreply-gerritcodereview@google.com>2021-04-30 18:23:28 +0000
commit2417e845b952f547a8e2cce109bad0eaeaa30992 (patch)
tree8bf7b12390942ec118f16225b23a2f17a7df80d5
parent3505cd8d8a5c81c990cac871e2bda47fafba7821 (diff)
parenta19613d41e0959e7c6bc2759045a9fd23b710738 (diff)
downloadbuild-pie-cts-dev.tar.gz
Merge "Fix bug: include all dirs not just the last one." into pie-cts-devpie-cts-dev
-rwxr-xr-xtools/generate-notice-files.py5
1 files changed, 2 insertions, 3 deletions
diff --git a/tools/generate-notice-files.py b/tools/generate-notice-files.py
index bd753108e7..ea1a7d2e9e 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
@@ -252,8 +252,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: