mirror of
https://gitlab.com/fdroid/fdroidserver.git
synced 2024-08-15 19:00:11 +02:00
unified method for naming build output
This commit is contained in:
parent
62af9b8e3d
commit
5b7209d882
@ -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:
|
||||
|
@ -467,7 +467,7 @@ def main():
|
||||
for build in app.builds:
|
||||
apks = []
|
||||
for f in os.listdir(options.repo_path):
|
||||
n = "%v_%v.apk".format(app_id, build.versionCode)
|
||||
n = common.get_release_filename(app, build)
|
||||
if f == n:
|
||||
apks.append(f)
|
||||
for apk in sorted(apks):
|
||||
|
@ -319,7 +319,7 @@ def delete_disabled_builds(apps, apkcache, repodirs):
|
||||
for build in app['builds']:
|
||||
if not build.disable:
|
||||
continue
|
||||
apkfilename = appid + '_' + str(build.versionCode) + '.apk'
|
||||
apkfilename = common.get_release_filename(app, build)
|
||||
iconfilename = "%s.%s.png" % (
|
||||
appid,
|
||||
build.versionCode)
|
||||
|
Loading…
Reference in New Issue
Block a user