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

fix invalid extension of output apk

Browse source
This commit is contained in:
linsui 2021-06-19 13:30:56 +08:00 • committed by Jochen Sprickerhof
parent ab0fe06343
commit 763a2ee80d
3 changed files with 40 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

7
fdroidserver/build.py
View file

@ -810,7 +810,12 @@ def build_local(app, build, vcs, build_dir, output_dir, log_dir, srclib_dir, ext
# Copy the unsigned APK to our destination directory for further
# processing (by publish.py)...
dest = os.path.join(output_dir, common.get_release_filename(app, build))
dest = os.path.join(
output_dir,
common.get_release_filename(
app, build, common.get_file_extension(src)
)
)
shutil.copyfile(src, dest)
# Move the source tarball into the output directory...

6
fdroidserver/common.py
View file

@ -785,8 +785,10 @@ def apk_parse_release_filename(apkname):
return None, None, None
def get_release_filename(app, build):
if build.output:
def get_release_filename(app, build, extension=None):
if extension:
return "%s_%s.%s" % (app.id, build.versionCode, extension)
if build.output and get_file_extension(build.output):
return "%s_%s.%s" % (app.id, build.versionCode, get_file_extension(build.output))
else:
return "%s_%s.apk" % (app.id, build.versionCode)