From: Hans-Christoph Steiner <hans@eds.org>
Date: Wed, 1 Mar 2017 20:25:42 +0000 (+0100)
Subject: update: do not include PGP signatures as "media" files
X-Git-Tag: 0.8~111^2~2
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=0be58c2dca944140afe171d84f5478649c8b1bb4;p=fdroidserver.git

update: do not include PGP signatures as "media" files

A .asc or .sig file is a detached PGPG signature, `fdroid gpgsign`
generates them.  It makes no sense for them to be ever treated as a file
for distribution.

This also adds to forgotten forms of index files.
---

diff --git a/fdroidserver/common.py b/fdroidserver/common.py
index e01b7115..1d2275f1 100644
--- a/fdroidserver/common.py
+++ b/fdroidserver/common.py
@@ -2163,8 +2163,11 @@ def get_per_app_repos():
 def is_repo_file(filename):
     '''Whether the file in a repo is a build product to be delivered to users'''
     return os.path.isfile(filename) \
+        and not filename.endswith('.asc') \
+        and not filename.endswith('.sig') \
         and os.path.basename(filename) not in [
             'index.jar',
+            'index_unsigned.jar',
             'index.xml',
             'index.html',
             'categories.txt',