Merge branch 'remove-fd-commit' into 'master'

remove fd-commit, no active devs use it, and requires Auto Name/Name

See merge request fdroid/fdroidserver!392

diff --git a/fdroid b/fdroid
index f5e6c92b5dce805a11109987e948531f1cf44599..74339df00f8348aec0009ff3ff981daa0a41b4bf 100755 (executable)
--- a/fdroid
+++ b/fdroid
@@ -53,7 +53,7 @@ commands = OrderedDict([
 
 
 def print_help():
-    print(_("usage: ") + _("fdroid [-h|--help|--version] <command> [<args>]"))
+    print(_("usage: ") + _("fdroid [<command>] [-h|--help|--version|<args>]"))
     print("")
     print(_("Valid commands are:"))
     for cmd, summary in commands.items():

diff --git a/fdroidserver/metadata.py b/fdroidserver/metadata.py
index c29c1e4c29a079e545f60d678df0d5c11b7c6c5f..d2bae63feff270216120ee1d7bfc89989fcec2d6 100644 (file)
--- a/fdroidserver/metadata.py
+++ b/fdroidserver/metadata.py
@@ -1545,5 +1545,5 @@ def write_metadata(metadatapath, app):
 
 def add_metadata_arguments(parser):
     '''add common command line flags related to metadata processing'''
-    parser.add_argument("-W", default='error',
-                        help=_("force errors to be warnings, or ignore"))
+    parser.add_argument("-W", choices=['error', 'warn', 'ignore'], default='error',
+                        help=_("force metadata errors (default) to be warnings, or to be ignored."))

diff --git a/makebuildserver b/makebuildserver
index b453d813ecd550f7054563686fa1620bea97f5fd..831eede3dc198c42e9d3ff75dddc579092b8fed8 100755 (executable)
--- a/makebuildserver
+++ b/makebuildserver
@@ -179,7 +179,7 @@ cachefiles = [
     ('https://dl.google.com/android/repository/platform-26_r02.zip',
      '2aafa7d19c5e9c4b643ee6ade3d85ef89dc2f79e8383efdb9baf7fddad74b52a'),
     ('https://dl.google.com/android/repository/platform-27_r01.zip',
-     'cbba6f8fcf025e1b533326746763aa1d6e2cf4001b1b441602bb44d253bc49ac'),
+     '96ddff1a5034fcc4340f2d482635eeaccaa6707b6b0f82d26d1435476a2f52e5'),
     ('https://dl.google.com/android/repository/build-tools_r17-linux.zip',
      '4c8444972343a19045236f6924bd7f12046287c70dace96ab88b2159c8ec0e74'),
     ('https://dl.google.com/android/repository/build-tools_r18.0.1-linux.zip',
@@ -553,12 +553,12 @@ def main():
         for d in ('.m2', '.gradle/caches', '.gradle/wrapper', '.pip_download_cache'):
             fullpath = os.path.join(os.getenv('HOME'), d)
             if os.path.isdir(fullpath):
-                ssh_command = ' '.join('ssh -i {0} -p {1}'.format(key, port),
-                                       '-o StrictHostKeyChecking=no',
-                                       '-o UserKnownHostsFile=/dev/null',
-                                       '-o LogLevel=FATAL',
-                                       '-o IdentitiesOnly=yes',
-                                       '-o PasswordAuthentication=no')
+                ssh_command = ' '.join(('ssh -i {0} -p {1}'.format(key, port),
+                                        '-o StrictHostKeyChecking=no',
+                                        '-o UserKnownHostsFile=/dev/null',
+                                        '-o LogLevel=FATAL',
+                                        '-o IdentitiesOnly=yes',
+                                        '-o PasswordAuthentication=no'))
                 # TODO vagrant 1.5+ provides `vagrant rsync`
                 run_via_vagrant_ssh(v, ['cd ~ && test -d', d, '|| mkdir -p', d])
                 subprocess.call(['rsync', '-axv', '--progress', '--delete', '-e',