From: Hans-Christoph Steiner <hans@eds.org>
Date: Fri, 23 Feb 2018 21:42:46 +0000 (+0100)
Subject: rewritemeta: fix proper_format() so lint works with .yml files
X-Git-Tag: 1.0.3~24
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=0fa50ebcb2fa3cde7433b288b5ce365102b4ab15;p=fdroidserver.git

rewritemeta: fix proper_format() so lint works with .yml files
---

diff --git a/fdroidserver/rewritemeta.py b/fdroidserver/rewritemeta.py
index ed941bd7..b731a872 100644
--- a/fdroidserver/rewritemeta.py
+++ b/fdroidserver/rewritemeta.py
@@ -36,7 +36,11 @@ def proper_format(app):
     # read in metadata.py
     with open(app.metadatapath, 'r', encoding='utf8') as f:
         cur_content = f.read()
-    metadata.write_txt(s, app)
+    _ignored, extension = common.get_extension(app.metadatapath)
+    if extension == 'yml':
+        metadata.write_yaml(s, app)
+    elif extension == 'txt':
+        metadata.write_txt(s, app)
     content = s.getvalue()
     s.close()
     return content == cur_content