chiark / gitweb /
make build reproducible by fixing sort order in docs
[fdroidserver.git] / fdroid
diff --git a/fdroid b/fdroid
index 045f2aacf8e5f133c61fff43c126d7bcb1add75b..53cc00c5dcc5eff9a1bf1e65fdf261300a28141b 100755 (executable)
--- a/fdroid
+++ b/fdroid
@@ -76,9 +76,11 @@ def main():
                     import subprocess
                     try:
                         output = subprocess.check_output(['git', 'describe'],
-                                                         stderr=subprocess.STDOUT)
+                                                         stderr=subprocess.STDOUT,
+                                                         universal_newlines=True)
                     except subprocess.CalledProcessError:
-                        output = 'git commit ' + subprocess.check_output(['git', 'rev-parse', 'HEAD'])
+                        output = 'git commit ' + subprocess.check_output(['git', 'rev-parse', 'HEAD'],
+                                                                         universal_newlines=True)
                 elif os.path.exists('setup.py'):
                     import re
                     m = re.search(r'''.*[\s,\(]+version\s*=\s*["']([0-9a-z.]+)["'].*''',