mirrors/fdroidserver
1
0
Fork 0
mirror of https://github.com/f-droid/fdroidserver.git synced 2025-11-05 15:00:30 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

keep .apk file ext when diffoscope'ing Binaries:

Browse source
This commit is contained in:
Hans-Christoph Steiner 2017-07-15 20:15:30 +00:00
parent 2ecaf6ef8d
commit 67d98c5a36
2 changed files with 3 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
fdroidserver/build.py
View file

@ -1158,7 +1158,7 @@ def main():
url = url.replace('%v', build.versionName) url = url.replace('%v', build.versionName)
url = url.replace('%c', str(build.versionCode)) url = url.replace('%c', str(build.versionCode))
logging.info("...retrieving " + url) 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) of = os.path.join(output_dir, of)
try: try:
net.download_file(url, local_filename=of) net.download_file(url, local_filename=of)

3
fdroidserver/publish.py
View file

@ -19,6 +19,7 @@
import sys import sys
import os import os
import re
import shutil import shutil
import glob import glob
import hashlib import hashlib
@ -128,7 +129,7 @@ def main():
# version if everything checks out. # version if everything checks out.
# The binary should already have been retrieved during the build # The binary should already have been retrieved during the build
# process. # process.
srcapk = apkfile + ".binary" srcapk = re.sub(r'.apk$', '.binary.apk', apkfile)
# Compare our unsigned one with the downloaded one... # Compare our unsigned one with the downloaded one...
compare_result = common.verify_apks(srcapk, apkfile, tmp_dir) compare_result = common.verify_apks(srcapk, apkfile, tmp_dir)