From: Hans-Christoph Steiner <hans@eds.org>
Date: Wed, 6 Dec 2017 21:33:46 +0000 (+0100)
Subject: update: do not replace Name/Summary from template unless blank
X-Git-Tag: 1.0.0~37^2~3
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;ds=sidebyside;h=5d54446efcbbb275a5f5bff5faf778f7a84c2528;p=fdroidserver.git

update: do not replace Name/Summary from template unless blank

`fdroid nightly` needs this change so it can set the Summary using the
template.
---

diff --git a/fdroidserver/update.py b/fdroidserver/update.py
index 71c4e430..097513bf 100644
--- a/fdroidserver/update.py
+++ b/fdroidserver/update.py
@@ -1670,7 +1670,7 @@ def create_metadata_from_template(apk):
         with open('template.yml') as f:
             metatxt = f.read()
         if 'name' in apk and apk['name'] != '':
-            metatxt = re.sub(r'^(((Auto)?Name|Summary):).*$',
+            metatxt = re.sub(r'''^(((Auto)?Name|Summary):)[ '"\.]*$''',
                              r'\1 ' + apk['name'],
                              metatxt,
                              flags=re.IGNORECASE | re.MULTILINE)