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

Merge branch 'fix-metadata_find_signing_files' into 'master'

Browse source 
fix metadata_find_signing_files()

See merge request fdroid/fdroidserver!906
This commit is contained in:
Jochen Sprickerhof 2021-04-14 22:04:46 +00:00
commit e2214ebc4b
1 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
fdroidserver/common.py
View file

@ -3006,8 +3006,8 @@ def metadata_find_signing_files(appid, vercode):
+ glob.glob(os.path.join(sigdir, '*.RSA')) + glob.glob(os.path.join(sigdir, '*.RSA'))
) )
signature_block_pat = re.compile(r'(\.DSA|\.EC|\.RSA)$') signature_block_pat = re.compile(r'(\.DSA|\.EC|\.RSA)$')
apk_signing_block = os.path.isfile(os.path.join(sigdir, "APKSigningBlock")) apk_signing_block = os.path.join(sigdir, "APKSigningBlock")
apk_signing_block_offset = os.path.isfile(os.path.join(sigdir, "APKSigningBlockOffset")) apk_signing_block_offset = os.path.join(sigdir, "APKSigningBlockOffset")
if os.path.isfile(apk_signing_block) and os.path.isfile(apk_signing_block_offset): if os.path.isfile(apk_signing_block) and os.path.isfile(apk_signing_block_offset):
v2_files = apk_signing_block, apk_signing_block_offset v2_files = apk_signing_block, apk_signing_block_offset
else: else: