From: Marvin W <git@larma.de>
Date: Wed, 27 Jan 2016 15:51:03 +0000 (+0000)
Subject: Support 'gpgkey' option as announced in sample config.
X-Git-Tag: 0.6.0~21^2
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=6130e6eaf0e27c81754ca3451e31ba50d96984c7;p=fdroidserver.git

Support 'gpgkey' option as announced in sample config.
---

diff --git a/fdroidserver/gpgsign.py b/fdroidserver/gpgsign.py
index 15c4deeb..07b0b155 100644
--- a/fdroidserver/gpgsign.py
+++ b/fdroidserver/gpgsign.py
@@ -63,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: