diff options
| author | Johnathan Corgan <johnathan@corganlabs.com> | 2017-06-22 18:02:20 -0700 |
|---|---|---|
| committer | Johnathan Corgan <johnathan@corganlabs.com> | 2017-06-22 18:02:20 -0700 |
| commit | 1e02521a72304f898b3523148f35038f53bbb056 (patch) | |
| tree | 3d5ea9b14603cf9b1875327a1915bad345b83bde /gr-utils/python | |
| parent | b63e8cf03236257730680adfd75378daf3f5c153 (diff) | |
| parent | 99ee660ce3701a33efa1737ae341e5360661f900 (diff) | |
Merge branch 'next' into python3
Conflicts:
gr-uhd/apps/uhd_app.py
Diffstat (limited to 'gr-utils/python')
| -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 f4c24c7463..dffd403a37 100644 --- a/gr-utils/python/modtool/modtool_makexml.py +++ b/gr-utils/python/modtool/modtool_makexml.py @@ -82,7 +82,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 0cb012fe9e..248d1b7ca8 100644 --- a/gr-utils/python/modtool/modtool_rm.py +++ b/gr-utils/python/modtool/modtool_rm.py @@ -134,7 +134,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: |