[tor-commits] [tor-browser/tor-browser-17.0.6esr-5] Determinism build fix: Expandlibs archive extractor is non-deterministic.

[mikeperry at torproject.org]

commit 777675e958c5d4945db7d7615657d863e76953f7
Author: Mike Perry <mikeperry-git at torproject.org>
Date:   Wed Jun 12 00:56:14 2013 -0700

    Determinism build fix: Expandlibs archive extractor is non-deterministic.
---
 config/expandlibs_exec.py        |    4 ++--
 js/src/config/expandlibs_exec.py |    4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/config/expandlibs_exec.py b/config/expandlibs_exec.py
index d2e9e0e..3b5b054 100644
--- a/config/expandlibs_exec.py
+++ b/config/expandlibs_exec.py
@@ -77,7 +77,7 @@ class ExpandArgsMore(ExpandArgs):
                     objs = []
                     for root, dirs, files in os.walk(tmp):
                         objs += [relativize(os.path.join(root, f)) for f in files if isObject(f)]
-                    newlist += objs
+                    newlist += sorted(objs)
                 else:
                     newlist += [arg]
             else:
@@ -301,7 +301,7 @@ def main():
         if options.uselist:
             args.makelist()
 
-        if options.verbose:
+        if True: #options.verbose:
             print >>sys.stderr, "Executing: " + " ".join(args)
             for tmp in [f for f in args.tmp if os.path.isfile(f)]:
                 print >>sys.stderr, tmp + ":"
diff --git a/js/src/config/expandlibs_exec.py b/js/src/config/expandlibs_exec.py
index d2e9e0e..3b5b054 100644
--- a/js/src/config/expandlibs_exec.py
+++ b/js/src/config/expandlibs_exec.py
@@ -77,7 +77,7 @@ class ExpandArgsMore(ExpandArgs):
                     objs = []
                     for root, dirs, files in os.walk(tmp):
                         objs += [relativize(os.path.join(root, f)) for f in files if isObject(f)]
-                    newlist += objs
+                    newlist += sorted(objs)
                 else:
                     newlist += [arg]
             else:
@@ -301,7 +301,7 @@ def main():
         if options.uselist:
             args.makelist()
 
-        if options.verbose:
+        if True: #options.verbose:
             print >>sys.stderr, "Executing: " + " ".join(args)
             for tmp in [f for f in args.tmp if os.path.isfile(f)]:
                 print >>sys.stderr, tmp + ":"