From: Hans-Christoph Steiner <hans@eds.org>
Date: Fri, 10 Mar 2017 16:40:19 +0000 (+0100)
Subject: update: do not include fdroid-generated tarballs as "media" files
X-Git-Tag: 0.8~109^2~2
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=9d363b91f479f6b96aa4e2e3e9f6dcc54f6019c2;p=fdroidserver.git

update: do not include fdroid-generated tarballs as "media" files

`fdroid build` will generate source tarballs, and now with support for
adding any file to a repo, we need to explicitly ignore the fdroid-
generated source tarballs.  If people want to include source tarballs in a
repo, they still can, as long as that source tarball doesn't use the
`fdroid build` tarball naming scheme.
---

diff --git a/fdroidserver/update.py b/fdroidserver/update.py
index 0e6c39a6..203e101f 100644
--- a/fdroidserver/update.py
+++ b/fdroidserver/update.py
@@ -48,7 +48,7 @@ from . import metadata
 from .common import FDroidPopen, FDroidPopenBytes, SdkToolsPopen
 from .metadata import MetaDataException
 
-METADATA_VERSION = 17
+METADATA_VERSION = 18
 
 screen_densities = ['640', '480', '320', '240', '160', '120']
 
@@ -549,6 +549,9 @@ def scan_repo_files(apkcache, repodir, knownapks, use_date_from_file=False):
         if file_extension == 'apk' or file_extension == 'obb':
             continue
         filename = os.path.join(repodir, name)
+        if filename.endswith('_src.tar.gz'):
+            logging.debug('skipping source tarball:', filename)
+            continue
         if not common.is_repo_file(filename):
             continue
         stat = os.stat(filename)