From 7a3baa01ed037ce13004473cf4dba9c4c995fb1f Mon Sep 17 00:00:00 2001
From: Ciaran Gultnieks <ciaran@ciarang.com>
Date: Tue, 2 Jun 2015 09:16:29 +0100
Subject: [PATCH] Allow gpg home directory to be overridden

---
 examples/config.py       |  3 +++
 fdroidserver/gpgsign.py  | 11 +++++++----
 fdroidserver/metadata.py |  2 --
 3 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/examples/config.py b/examples/config.py
index 4ad5a323..b8c06d8d 100644
--- a/examples/config.py
+++ b/examples/config.py
@@ -65,6 +65,9 @@ The repository of older versions of applications from the main demo repository.
 # metadata here:
 # current_version_name_source = 'id'
 
+# Optionally, override home directory for gpg
+# gpghome = /home/fdroid/somewhere/else/.gnupg
+
 # The ID of a GPG key for making detached signatures for apks. Optional.
 # gpgkey = '1DBA2E89'
 
diff --git a/fdroidserver/gpgsign.py b/fdroidserver/gpgsign.py
index fa874cb8..0358e99e 100644
--- a/fdroidserver/gpgsign.py
+++ b/fdroidserver/gpgsign.py
@@ -61,10 +61,13 @@ def main():
             sigpath = os.path.join(output_dir, sigfilename)
 
             if not os.path.exists(sigpath):
-                p = FDroidPopen(['gpg', '-a',
-                                 '--output', sigpath,
-                                 '--detach-sig',
-                                 os.path.join(output_dir, apkfilename)])
+                gpgargs = ['gpg', '-a',
+                           '--output', sigpath,
+                           '--detach-sig']
+                if 'gpghome' in config:
+                    gpgargs.extend(['--homedir', config['gpghome']])
+                gpgargs.append(os.path.join(output_dir, apkfilename))
+                p = FDroidPopen(gpgargs)
                 if p.returncode != 0:
                     logging.error("Signing failed.")
                     sys.exit(1)
diff --git a/fdroidserver/metadata.py b/fdroidserver/metadata.py
index fada0ead..d707ac6e 100644
--- a/fdroidserver/metadata.py
+++ b/fdroidserver/metadata.py
@@ -339,8 +339,6 @@ class DescriptionFormatter:
                 else:
                     urltxt = url[index2 + 1:]
                     url = url[:index2]
-                if ':' not in url:
-                    raise MetaDataException("'%s' doesn't look like an URL" % url)
                 linkified_html += '<a href="' + url + '">' + cgi.escape(urltxt) + '</a>'
                 linkified_plain += urltxt
                 if urltxt != url: