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

Merge branch 'refuse-publishing-duplicate-apks' into 'master'

Browse source 
proper error message when publishing with the same app in repo and unsigned

See merge request !329
This commit is contained in:
Hans-Christoph Steiner 2017-09-12 15:33:51 +00:00
commit 253bd92df3
1 changed files with 7 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

7
fdroidserver/publish.py
View file

@ -194,6 +194,13 @@ def main():
if p.returncode != 0: if p.returncode != 0:
raise BuildException("Failed to generate key") raise BuildException("Failed to generate key")
signed_apk_path = os.path.join(output_dir, apkfilename)
if os.path.exists(signed_apk_path):
raise BuildException("Refusing to sign '{0}' file exists in both "
"{1} and {2} folder.".format(apkfilename,
unsigned_dir,
output_dir))
# Sign the application... # Sign the application...
p = FDroidPopen([config['jarsigner'], '-keystore', config['keystore'], p = FDroidPopen([config['jarsigner'], '-keystore', config['keystore'],
'-storepass:env', 'FDROID_KEY_STORE_PASS', '-storepass:env', 'FDROID_KEY_STORE_PASS',