From: Hans-Christoph Steiner <hans@eds.org>
Date: Thu, 7 Dec 2017 20:40:15 +0000 (+0100)
Subject: metadata: error if .fdroid.txt exists, it is unsupported
X-Git-Tag: 1.0.0~33^2~2
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=4af8f196e349f0660b2401e679f052c6c9dd532b;hp=1d83d4396c280db6f46d712bf2133577dcbba0ed;p=fdroidserver.git

metadata: error if .fdroid.txt exists, it is unsupported

Using .txt format has bugs when used embedded in an app's git repo, so
tell the user to use YAML or JSON.

#364
---

diff --git a/fdroidserver/metadata.py b/fdroidserver/metadata.py
index d2bae63f..c066d499 100644
--- a/fdroidserver/metadata.py
+++ b/fdroidserver/metadata.py
@@ -748,6 +748,8 @@ def read_metadata(xref=True, check_vcs=[], sort_by_time=False):
         metadatafiles = sorted(metadatafiles)
 
     for metadatapath in metadatafiles:
+        if metadatapath == '.fdroid.txt':
+            warn_or_exception(_('.fdroid.txt is not supported!  Convert to .fdroid.yml or .fdroid.json.'))
         packageName, _ignored = fdroidserver.common.get_extension(os.path.basename(metadatapath))
         if packageName in apps:
             warn_or_exception(_("Found multiple metadata files for {appid}")