Skip to content

Commit 90139f8

Browse files
authored
Deterministically sort files from os.walk in file packager [NFC] (#17550)
This ensures a consistent order even across OSes.
1 parent 5c4b167 commit 90139f8

File tree

1 file changed

+4
-0
lines changed

1 file changed

+4
-0
lines changed

tools/file_packager.py

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -521,6 +521,10 @@ def was_seen(name):
521521
seen.add(name)
522522
return False
523523

524+
# The files are sorted by the dstpath to make the order of files reproducible
525+
# across file systems / operating systems (os.walk does not produce the same
526+
# file order on different file systems / operating systems)
527+
data_files = sorted(data_files, key=lambda file_: file_.dstpath)
524528
data_files = [file_ for file_ in data_files if not was_seen(file_.dstpath)]
525529

526530
if AV_WORKAROUND:

0 commit comments

Comments
 (0)