From: Hans-Christoph Steiner <hans@eds.org>
Date: Sat, 11 Oct 2014 00:54:32 +0000 (-0400)
Subject: when symlinking current version of app, include gpg sig if it exists
X-Git-Tag: 0.3.0~21^2~3
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=803ec39e23eb357b9d376f20fae56b49c76f895b;p=fdroidserver.git

when symlinking current version of app, include gpg sig if it exists

Let's make it easy for people to also find the GPG signature, and promote
easy verification!
---

diff --git a/fdroidserver/update.py b/fdroidserver/update.py
index cd59a656..b96d860e 100644
--- a/fdroidserver/update.py
+++ b/fdroidserver/update.py
@@ -869,9 +869,18 @@ def make_index(apps, sortedids, apks, repodir, archive, categories):
                 and config['make_current_version_link'] \
                 and repodir == 'repo':  # only create these
             apklinkname = app[config['current_version_name_source']] + '.apk'
+            current_version_path = os.path.join(repodir, current_version_file)
             if os.path.exists(apklinkname):
                 os.remove(apklinkname)
-            os.symlink(os.path.join(repodir, current_version_file), apklinkname)
+            os.symlink(current_version_path, apklinkname)
+            # also symlink gpg signature, if it exists
+            for extension in ('.asc', '.sig'):
+                sigfile_path = current_version_path + extension
+                if os.path.exists(sigfile_path):
+                    siglinkname = apklinkname + extension
+                    if os.path.exists(siglinkname):
+                        os.remove(siglinkname)
+                    os.symlink(sigfile_path, siglinkname)
 
     of = open(os.path.join(repodir, 'index.xml'), 'wb')
     if options.pretty: