Merge branch 'plural' into 'master'

[fdroidserver.git] / fdroidserver / publish.py

diff --git a/fdroidserver/publish.py b/fdroidserver/publish.py
index 622de59c4c14a9c49f794f3adc1d45f110f5fb43..b15c12a8553e93e031a9bdc12ac84dcd269dc8fd 100644 (file)
--- a/fdroidserver/publish.py
+++ b/fdroidserver/publish.py
@@ -19,15 +19,19 @@
 
 import sys
 import os
+import re
 import shutil
 import glob
 import hashlib
 from argparse import ArgumentParser
 import logging
+from gettext import ngettext
 
+from . import _
 from . import common
 from . import metadata
-from .common import FDroidPopen, SdkToolsPopen, BuildException
+from .common import FDroidPopen, SdkToolsPopen
+from .exception import BuildException
 
 config = None
 options = None
@@ -41,7 +45,7 @@ def main():
     parser = ArgumentParser(usage="%(prog)s [options] "
                             "[APPID[:VERCODE] [APPID[:VERCODE] ...]]")
     common.setup_global_opts(parser)
-    parser.add_argument("appid", nargs='*', help="app-id with optional versionCode in the form APPID[:VERCODE]")
+    parser.add_argument("appid", nargs='*', help=_("applicationId with optional versionCode in the form APPID[:VERCODE]"))
     metadata.add_metadata_arguments(parser)
     options = parser.parse_args()
     metadata.warnings_action = options.W
@@ -49,27 +53,27 @@ def main():
     config = common.read_config(options)
 
     if not ('jarsigner' in config and 'keytool' in config):
-        logging.critical('Java JDK not found! Install in standard location or set java_paths!')
+        logging.critical(_('Java JDK not found! Install in standard location or set java_paths!'))
         sys.exit(1)
 
     log_dir = 'logs'
     if not os.path.isdir(log_dir):
-        logging.info("Creating log directory")
+        logging.info(_("Creating log directory"))
         os.makedirs(log_dir)
 
     tmp_dir = 'tmp'
     if not os.path.isdir(tmp_dir):
-        logging.info("Creating temporary directory")
+        logging.info(_("Creating temporary directory"))
         os.makedirs(tmp_dir)
 
     output_dir = 'repo'
     if not os.path.isdir(output_dir):
-        logging.info("Creating output directory")
+        logging.info(_("Creating output directory"))
         os.makedirs(output_dir)
 
     unsigned_dir = 'unsigned'
     if not os.path.isdir(unsigned_dir):
-        logging.warning("No unsigned directory - nothing to do")
+        logging.warning(_("No unsigned directory - nothing to do"))
         sys.exit(1)
 
     if not os.path.exists(config['keystore']):
@@ -93,11 +97,11 @@ def main():
         m.update(appid.encode('utf-8'))
         keyalias = m.hexdigest()[:8]
         if keyalias in allaliases:
-            logging.error("There is a keyalias collision - publishing halted")
+            logging.error(_("There is a keyalias collision - publishing halted"))
             sys.exit(1)
         allaliases.append(keyalias)
-    logging.info("{0} apps, {0} key aliases".format(len(allapps),
-                                                    len(allaliases)))
+    logging.info(ngettext('{0} app, {1} key aliases',
+                          '{0} apps, {1} key aliases', len(allapps)).format(len(allapps), len(allaliases)))
 
     # Process any APKs or ZIPs that are waiting to be signed...
     for apkfile in sorted(glob.glob(os.path.join(unsigned_dir, '*.apk'))
@@ -127,7 +131,7 @@ def main():
             # version if everything checks out.
             # The binary should already have been retrieved during the build
             # process.
-            srcapk = apkfile + ".binary"
+            srcapk = re.sub(r'.apk$', '.binary.apk', apkfile)
 
             # Compare our unsigned one with the downloaded one...
             compare_result = common.verify_apks(srcapk, apkfile, tmp_dir)
@@ -192,6 +196,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',
@@ -199,13 +210,13 @@ def main():
                              'SHA1withRSA', '-digestalg', 'SHA1',
                              apkfile, keyalias], envs=env_vars)
             if p.returncode != 0:
-                raise BuildException("Failed to sign application")
+                raise BuildException(_("Failed to sign application"))
 
             # Zipalign it...
             p = SdkToolsPopen(['zipalign', '-v', '4', apkfile,
                                os.path.join(output_dir, apkfilename)])
             if p.returncode != 0:
-                raise BuildException("Failed to align application")
+                raise BuildException(_("Failed to align application"))
             os.remove(apkfile)
 
         # Move the source tarball into the output directory...