From: Phoenix09 Date: Sat, 14 Apr 2018 22:30:23 +0000 (+0100) Subject: fdroidserver/update.py: APK_LABEL_ICON_PAT icon pattern should not be greedy X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=ea89b25fd791e3697638e616daf85f405b955044;p=fdroidserver.git fdroidserver/update.py: APK_LABEL_ICON_PAT icon pattern should not be greedy --- diff --git a/fdroidserver/update.py b/fdroidserver/update.py index 0d8a50fb..c79c6d52 100644 --- a/fdroidserver/update.py +++ b/fdroidserver/update.py @@ -53,7 +53,7 @@ UNSET_VERSION_CODE = -0x100000000 APK_NAME_PAT = re.compile(".*name='([a-zA-Z0-9._]*)'.*") APK_VERCODE_PAT = re.compile(".*versionCode='([0-9]*)'.*") APK_VERNAME_PAT = re.compile(".*versionName='([^']*)'.*") -APK_LABEL_ICON_PAT = re.compile(".*\s+label='(.*)'\s+icon='(.*)'") +APK_LABEL_ICON_PAT = re.compile(".*\s+label='(.*)'\s+icon='(.*?)'") APK_SDK_VERSION_PAT = re.compile(".*'([0-9]*)'.*") APK_PERMISSION_PAT = \ re.compile(".*(name='(?P.*?)')(.*maxSdkVersion='(?P.*?)')?.*")