Support 'gpgkey' option as announced in sample config.

[fdroidserver.git] / fdroidserver / gpgsign.py

diff --git a/fdroidserver/gpgsign.py b/fdroidserver/gpgsign.py
index 8fca41cd46ad125cf80dc38049be7d6966fd77e1..07b0b155b65680172d79196780ed47d2eb4f1c9a 100644 (file)
--- a/fdroidserver/gpgsign.py
+++ b/fdroidserver/gpgsign.py
@@ -36,10 +36,7 @@ def main():
 
     # Parse command line...
     parser = ArgumentParser(usage="%(prog)s [options]")
-    parser.add_argument("-v", "--verbose", action="store_true", default=False,
-                        help="Spew out even more information than normal")
-    parser.add_argument("-q", "--quiet", action="store_true", default=False,
-                        help="Restrict output to warnings and errors")
+    common.setup_global_opts(parser)
     options = parser.parse_args()
 
     config = common.read_config(options)
@@ -66,6 +63,8 @@ def main():
                            '--detach-sig']
                 if 'gpghome' in config:
                     gpgargs.extend(['--homedir', config['gpghome']])
+                if 'gpgkey' in config:
+                    gpgargs.extend(['--local-user', config['gpgkey']])
                 gpgargs.append(os.path.join(output_dir, apkfilename))
                 p = FDroidPopen(gpgargs)
                 if p.returncode != 0: