mirror of
https://gitlab.com/fdroid/fdroidserver.git
synced 2024-10-05 18:50:09 +02:00
Don't return Gradle variables as string
This is used in checkupdates and currently sets the AutoName to
something like ${displayName}:
4ae415f73c
This commit is contained in:
parent
a1dfd69392
commit
84b6617faf
@ -1425,7 +1425,11 @@ def unescape_string(string):
|
||||
|
||||
def retrieve_string(app_dir, string, xmlfiles=None):
|
||||
|
||||
if not string.startswith('@string/'):
|
||||
if string.startswith('@string/'):
|
||||
name = string[len('@string/'):]
|
||||
elif string.startswith('${'):
|
||||
return '' # Gradle variable
|
||||
else:
|
||||
return unescape_string(string)
|
||||
|
||||
if xmlfiles is None:
|
||||
@ -1438,8 +1442,6 @@ def retrieve_string(app_dir, string, xmlfiles=None):
|
||||
if os.path.basename(root) == 'values':
|
||||
xmlfiles += [os.path.join(root, x) for x in files if x.endswith('.xml')]
|
||||
|
||||
name = string[len('@string/'):]
|
||||
|
||||
def element_content(element):
|
||||
if element.text is None:
|
||||
return ""
|
||||
|
Loading…
Reference in New Issue
Block a user