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

unified method for naming build output

Browse source
This commit is contained in:
Michael Pöhn 2017-04-22 12:04:32 +02:00
parent 62af9b8e3d
commit 5b7209d882
3 changed files with 6 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

9
fdroidserver/build.py
View file

@ -1212,7 +1212,7 @@ def main():
url = url.replace('%v', build.versionName)
url = url.replace('%c', str(build.versionCode))
logging.info("...retrieving " + url)
of = "{0}_{1}.apk.binary".format(app.id, build.versionCode)
of = common.get_release_filename(app, build) + '.binary'
of = os.path.join(output_dir, of)
try:
net.download_file(url, local_filename=of)
@ -1225,10 +1225,9 @@ def main():
# and remove everything from the unsigend folder.
with tempfile.TemporaryDirectory() as tmpdir:
unsigned_apk = \
'{0}_{1}.apk'.format(appid,
build.versionCode)
unsigned_apk = os.path.join(output_dir,
unsigned_apk)
common.get_release_filename(app, build)
unsigned_apk = \
os.path.join(output_dir, unsigned_apk)
compare_result = \
common.verify_apks(of, unsigned_apk, tmpdir)
if compare_result: