keep .apk file ext when diffoscope'ing Binaries:

diff --git a/fdroidserver/build.py b/fdroidserver/build.py
index dff83104db74c2a44cbb2770e9b0671183bbb95d..3123a4ae9d835998113602b389c2a5409e6692bb 100644 (file)
--- a/fdroidserver/build.py
+++ b/fdroidserver/build.py
@@ -1158,7 +1158,7 @@ def main():
                         url = url.replace('%v', build.versionName)
                         url = url.replace('%c', str(build.versionCode))
                         logging.info("...retrieving " + url)
-                        of = common.get_release_filename(app, build) + '.binary'
+                        of = re.sub(r'.apk$', '.binary.apk', common.get_release_filename(app, build))
                         of = os.path.join(output_dir, of)
                         try:
                             net.download_file(url, local_filename=of)

diff --git a/fdroidserver/publish.py b/fdroidserver/publish.py
index 4d92ebdda1dab545c1a2c32ec2f68fb91b4fd256..1ca89e1558ce122eb4dc47845ef3cbe6d9d032e5 100644 (file)
--- a/fdroidserver/publish.py
+++ b/fdroidserver/publish.py
@@ -19,6 +19,7 @@
 
 import sys
 import os
+import re
 import shutil
 import glob
 import hashlib
@@ -128,7 +129,7 @@ def main():
             # version if everything checks out.
             # The binary should already have been retrieved during the build
             # process.
-            srcapk = apkfile + ".binary"
+            srcapk = re.sub(r'.apk$', '.binary.apk', apkfile)
 
             # Compare our unsigned one with the downloaded one...
             compare_result = common.verify_apks(srcapk, apkfile, tmp_dir)