Switch all headers to python3

[fdroidserver.git] / fdroidserver / gpgsign.py

diff --git a/fdroidserver/gpgsign.py b/fdroidserver/gpgsign.py
index 0358e99ed62ec1cb754d56fac262cf0bfc790fed..f27b9651c15d019eec7e1aad614df2197fb7c8c5 100644 (file)
--- a/fdroidserver/gpgsign.py
+++ b/fdroidserver/gpgsign.py
@@ -1,5 +1,4 @@
-#!/usr/bin/env python2
-# -*- coding: utf-8 -*-
+#!/usr/bin/env python3
 #
 # gpgsign.py - part of the FDroid server tools
 # Copyright (C) 2014, Ciaran Gultnieks, ciaran@ciarang.com
@@ -20,7 +19,7 @@
 import sys
 import os
 import glob
-from optparse import OptionParser
+from argparse import ArgumentParser
 import logging
 
 import common
@@ -35,12 +34,9 @@ def main():
     global config, options
 
     # Parse command line...
-    parser = OptionParser(usage="Usage: %prog [options]")
-    parser.add_option("-v", "--verbose", action="store_true", default=False,
-                      help="Spew out even more information than normal")
-    parser.add_option("-q", "--quiet", action="store_true", default=False,
-                      help="Restrict output to warnings and errors")
-    (options, args) = parser.parse_args()
+    parser = ArgumentParser(usage="%(prog)s [options]")
+    common.setup_global_opts(parser)
+    options = parser.parse_args()
 
     config = common.read_config(options)
 
@@ -66,6 +62,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: