Skip to content
Snippets Groups Projects
Commit 7914628b authored by Martin Geisler's avatar Martin Geisler
Browse files

relink: ensure deterministic directory walk in collect

parent 51144584
No related branches found
No related tags found
No related merge requests found
......@@ -72,4 +72,5 @@
ui.status(_("tip has %d files, estimated total number of files: %s\n")
% (live, total))
for dirpath, dirnames, filenames in os.walk(src):
dirnames.sort()
relpath = dirpath[len(src) + seplen:]
......@@ -75,5 +76,5 @@
relpath = dirpath[len(src) + seplen:]
for filename in filenames:
for filename in sorted(filenames):
if not filename[-2:] in ('.d', '.i'):
continue
st = os.stat(os.path.join(dirpath, filename))
......
......@@ -15,5 +15,5 @@
tip has 2 files, estimated total number of files: 3
collecting: 00changelog.i 1/3 files (33.33%)
collecting: 00manifest.i 2/3 files (66.67%)
collecting: dummy.i 3/3 files (100.00%)
collecting: a.i 3/3 files (100.00%)
collecting: b.i 4/3 files (133.33%)
......@@ -19,5 +19,5 @@
collecting: b.i 4/3 files (133.33%)
collecting: a.i 5/3 files (166.67%)
collecting: dummy.i 5/3 files (166.67%)
collected 5 candidate storage files
not linkable: 00changelog.i
not linkable: 00manifest.i
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment