Commit 1e73d181 authored by skobes's avatar skobes Committed by Commit bot

Fix duplicate name warnings from make_zip, and pass allowZip64.

BUG=672060,672851

Review-Url: https://codereview.chromium.org/2585633002
Cr-Commit-Position: refs/heads/master@{#439159}
parent f322da94
...@@ -21,16 +21,16 @@ def main(args): ...@@ -21,16 +21,16 @@ def main(args):
cwd = os.getcwd() cwd = os.getcwd()
os.chdir(build_dir) os.chdir(build_dir)
files = [] files = set()
for file_spec in exec_globals['FILES']: for file_spec in exec_globals['FILES']:
pattern = file_spec['filename'] pattern = file_spec['filename']
for glob_match in glob.glob(pattern): for glob_match in glob.glob(pattern):
if os.path.isfile(glob_match): if os.path.isfile(glob_match):
files.append(glob_match) files.add(glob_match)
elif os.path.isdir(glob_match): elif os.path.isdir(glob_match):
for root, dirs, filenames in os.walk(glob_match): for root, dirs, filenames in os.walk(glob_match):
for f in filenames: for f in filenames:
files.append(os.path.join(root, f)); files.add(os.path.join(root, f));
os.chdir(cwd) os.chdir(cwd)
if not len(files): if not len(files):
...@@ -38,8 +38,8 @@ def main(args): ...@@ -38,8 +38,8 @@ def main(args):
return 1 return 1
with zipfile.ZipFile(output_file, mode = 'w', with zipfile.ZipFile(output_file, mode = 'w',
compression = zipfile.ZIP_DEFLATED) as output: compression = zipfile.ZIP_DEFLATED, allowZip64 = True) as output:
for f in files: for f in sorted(files):
sys.stdout.write("%s\r" % f[:40].ljust(40, ' ')) sys.stdout.write("%s\r" % f[:40].ljust(40, ' '))
sys.stdout.flush() sys.stdout.flush()
output.write(os.path.join(build_dir, f), f) output.write(os.path.join(build_dir, f), f)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment