summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBernhard M. Wiedemann <bwiedemann@suse.de>2017-06-05 18:16:53 +0200
committerBernhard M. Wiedemann <bwiedemann@suse.de>2017-06-05 19:15:49 +0200
commit3d85897ce3b3f29e5287ce9cd2613a17c203da0f (patch)
tree51d1147429d3f9a8d55946590160030dec58874c
parent0e32fcaf928e8f3f9161a619201d3cf253a46ded (diff)
sort input files
when building packages (e.g. for openSUSE Linux) (random) filesystem order of input files influences ordering of functions in the output, thus without the patch, builds (in disposable VMs) would usually differ. See https://reproducible-builds.org/ for why this matters.
-rw-r--r--gr-utils/python/modtool/modtool_makexml.py2
-rw-r--r--gr-utils/python/modtool/modtool_rm.py2
2 files changed, 2 insertions, 2 deletions
diff --git a/gr-utils/python/modtool/modtool_makexml.py b/gr-utils/python/modtool/modtool_makexml.py
index 575d7eb873..9d047a67bc 100644
--- a/gr-utils/python/modtool/modtool_makexml.py
+++ b/gr-utils/python/modtool/modtool_makexml.py
@@ -79,7 +79,7 @@ class ModToolMakeXML(ModTool):
def _search_files(self, path, path_glob):
""" Search for files matching pattern in the given path. """
- files = glob.glob("%s/%s"% (path, path_glob))
+ files = sorted(glob.glob("%s/%s"% (path, path_glob)))
files_filt = []
print "Searching for matching files in %s/:" % path
for f in files:
diff --git a/gr-utils/python/modtool/modtool_rm.py b/gr-utils/python/modtool/modtool_rm.py
index 47128dbc87..67de33f044 100644
--- a/gr-utils/python/modtool/modtool_rm.py
+++ b/gr-utils/python/modtool/modtool_rm.py
@@ -127,7 +127,7 @@ class ModToolRemove(ModTool):
# 1. Create a filtered list
files = []
for g in globs:
- files = files + glob.glob("%s/%s"% (path, g))
+ files = files + sorted(glob.glob("%s/%s"% (path, g)))
files_filt = []
print "Searching for matching files in %s/:" % path
for f in files: