From: Daniel Martí <mvdan@mvdan.cc>
Date: Mon, 27 Jun 2016 07:03:58 +0000 (+0000)
Subject: Merge branch 'api-24' into 'master'
X-Git-Tag: 0.7.0~41
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=1210dc776970401cce228ee45abe79d6da62d357;hp=be4953be02577c9b4df42b96bef45dd0e6efd9a1;p=fdroidserver.git

Merge branch 'api-24' into 'master'

Api 24, gradle versions

CC @krt @eighthave

See merge request !140
---

diff --git a/fdroidserver/update.py b/fdroidserver/update.py
index 7cd18f41..cb1cb10f 100644
--- a/fdroidserver/update.py
+++ b/fdroidserver/update.py
@@ -438,7 +438,7 @@ def scan_apks(apps, apkcache, repodir, knownapks, use_date_from_apk=False):
     icon_pat = re.compile(".*application-icon-([0-9]+):'([^']+?)'.*")
     icon_pat_nodpi = re.compile(".*icon='([^']+?)'.*")
     sdkversion_pat = re.compile(".*'([0-9]*)'.*")
-    string_pat = re.compile(".*'([^']*)'.*")
+    string_pat = re.compile(".* name='([^']*)'.*")
     for apkfile in glob.glob(os.path.join(repodir, '*.apk')):
 
         apkfilename = apkfile[len(repodir) + 1:]