StrixOS/build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix bug: include all dirs not just the last one. am: 647bfb356a

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/14188806

Change-Id: I1e6dd857a093bddc41584ea9f872ec204a20d01d
This commit is contained in:
Mateusz Zięba
2021-04-14 22:48:09 +00:00
committed by Automerger Merge Worker
parent 307e58c439 647bfb356a
commit 33c9a9cae0
1 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
tools/generate-notice-files.py
View File

@@ -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
files_with_same_hash = defaultdict(list)
for input_dir in input_dirs: for input_dir in input_dirs:
files_with_same_hash = defaultdict(list)
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
@@ -254,8 +254,7 @@ def main(argv):
file_md5sum = md5sum(filename) file_md5sum = md5sum(filename)
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: