diff options
| author | Johnathan Corgan <johnathan@corganlabs.com> | 2017-06-22 17:48:18 -0700 |
|---|---|---|
| committer | Johnathan Corgan <johnathan@corganlabs.com> | 2017-06-22 17:48:18 -0700 |
| commit | 3e6b3921f9aeca5aa69b6f136acd9048e909ca9f (patch) | |
| tree | 210b4c87089f4b2f6ecc206fbf7f27159515f0c5 | |
| parent | 93e71836a5520349c1f80b2f5da4f38fb781ada7 (diff) | |
| parent | 3d85897ce3b3f29e5287ce9cd2613a17c203da0f (diff) | |
Merge remote-tracking branch 'github/pr/1322'
| -rw-r--r-- | gr-utils/python/modtool/modtool_makexml.py | 2 | ||||
| -rw-r--r-- | gr-utils/python/modtool/modtool_rm.py | 2 |
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: |