mirrors/fdroidserver
1
0
Fork 0
mirror of https://github.com/f-droid/fdroidserver.git synced 2025-11-04 22:40:29 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'handle_xml_ParseError' into 'master'

Browse source 
Handle XML parser errors

See merge request fdroid/fdroidserver!1090
This commit is contained in:
Jochen Sprickerhof 2022-03-13 08:50:13 +00:00
commit a2df6037a3
1 changed files with 10 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

12
fdroidserver/common.py
View file

@ -1564,7 +1564,11 @@ def retrieve_string(app_dir, string, xmlfiles=None):
for path in xmlfiles: for path in xmlfiles:
if not os.path.isfile(path): if not os.path.isfile(path):
continue continue
xml = parse_xml(path) try:
xml = parse_xml(path)
except XMLElementTree.ParseError:
logging.warning(_("Problem with xml at '{path}'").format(path=path))
continue
element = xml.find('string[@name="' + name + '"]') element = xml.find('string[@name="' + name + '"]')
if element is not None: if element is not None:
content = element_content(element) content = element_content(element)
@ -1606,7 +1610,11 @@ def fetch_real_name(app_dir, flavours):
if not path.endswith('.xml') or not os.path.isfile(path): if not path.endswith('.xml') or not os.path.isfile(path):
continue continue
logging.debug("fetch_real_name: Checking manifest at " + path) logging.debug("fetch_real_name: Checking manifest at " + path)
xml = parse_xml(path) try:
xml = parse_xml(path)
except XMLElementTree.ParseError:
logging.warning(_("Problem with xml at '{path}'").format(path=path))
continue
app = xml.find('application') app = xml.find('application')
if app is None: if app is None:
continue continue