From: Daniel Martí <mvdan@mvdan.cc>
Date: Mon, 25 Aug 2014 06:45:46 +0000 (+0200)
Subject: common: discard wrapping quotes in strings
X-Git-Tag: 0.3.0~77
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=5e988eb84dc559550d2f9b4b17ef8bec5935386e;p=fdroidserver.git

common: discard wrapping quotes in strings

Fixes auto names that shouldn't have wrapping quotes like '"PassDroid"'
instead of just 'PassDroid'.
---

diff --git a/fdroidserver/common.py b/fdroidserver/common.py
index e5a18fc5..6e9cf1ec 100644
--- a/fdroidserver/common.py
+++ b/fdroidserver/common.py
@@ -807,7 +807,7 @@ def retrieve_string(app_dir, string, xmlfiles=None):
 
     string_search = None
     if string.startswith('@string/'):
-        string_search = re.compile(r'.*name="' + string[8:] + '".*?>([^<]+?)<.*').search
+        string_search = re.compile(r'.*name="' + string[8:] + '".*?>"?([^<]+?)"?<.*').search
     elif string.startswith('&') and string.endswith(';'):
         string_search = re.compile(r'.*<!ENTITY.*' + string[1:-1] + '.*?"([^"]+?)".*>').search