sort.patch 788 B

1234567891011121314151617181920212223
  1. From 9eeb3b9ea13b25591c9081a5f05a1904d367d523 Mon Sep 17 00:00:00 2001
  2. From: Georg Koppen <gk@torproject.org>
  3. Date: Wed, 11 Sep 2019 13:25:54 +0000
  4. Subject: [PATCH] sorted
  5. diff --git a/utils/merge_archives.py b/utils/merge_archives.py
  6. index 58d92f0e2..597ca2471 100755
  7. --- a/utils/merge_archives.py
  8. +++ b/utils/merge_archives.py
  9. @@ -124,7 +124,7 @@ def main():
  10. execute_command_verbose([ar_exe, 'x', arc], cwd=temp_directory_root,
  11. verbose=args.verbose)
  12. - files = glob.glob(os.path.join(temp_directory_root, '*.o*'))
  13. + files = sorted(glob.glob(os.path.join(temp_directory_root, '*.o*')))
  14. if not files:
  15. print_and_exit('Failed to glob for %s' % temp_directory_root)
  16. cmd = [ar_exe, 'qcs', args.output] + files
  17. --
  18. 2.23.0