From 67d98c5a36025043d2f3875b52ca3a8837282dbd Mon Sep 17 00:00:00 2001 From: Hans-Christoph Steiner Date: Sat, 15 Jul 2017 20:15:30 +0000 Subject: [PATCH] keep .apk file ext when diffoscope'ing Binaries: --- fdroidserver/build.py | 2 +- fdroidserver/publish.py | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/fdroidserver/build.py b/fdroidserver/build.py index dff83104..3123a4ae 100644 --- 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 4d92ebdd..1ca89e15 100644 --- 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) -- 2.30.2