From 328c1ad0c7385d3a74063fc9e87fb643caf6960b Mon Sep 17 00:00:00 2001
From: =?utf8?q?Michael=20P=C3=B6hn?= <michael.poehn@fsfe.org>
Date: Tue, 30 May 2017 14:53:54 +0200
Subject: [PATCH] proper error message when publishing with the same app in
 repo and unsigned

---
 fdroidserver/publish.py | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/fdroidserver/publish.py b/fdroidserver/publish.py
index 1ca89e15..ad200906 100644
--- a/fdroidserver/publish.py
+++ b/fdroidserver/publish.py
@@ -194,6 +194,13 @@ def main():
                 if p.returncode != 0:
                     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...
             p = FDroidPopen([config['jarsigner'], '-keystore', config['keystore'],
                              '-storepass:env', 'FDROID_KEY_STORE_PASS',
-- 
2.30.2