mirrors/fdroidserver
1
0
Fork 0
mirror of https://github.com/f-droid/fdroidserver.git synced 2025-09-14 06:52:39 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Catch DefusedXmlException (as ValueError)

Browse source 
defusedxml can't handle the nbsp in the strings.xml (etree can).
This commit is contained in:
Jochen Sprickerhof 2022-07-25 08:52:57 +02:00
parent 7e1d974351
commit 7822db2881
5 changed files with 1345 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

6
fdroidserver/common.py
View file

@ -1579,7 +1579,7 @@ def retrieve_string(app_dir, string, xmlfiles=None):
continue
try:
xml = parse_xml(path)
except XMLElementTree.ParseError:
except (XMLElementTree.ParseError, ValueError):
logging.warning(_("Problem with xml at '{path}'").format(path=path))
continue
element = xml.find('string[@name="' + name + '"]')
@ -1625,7 +1625,7 @@ def fetch_real_name(app_dir, flavours):
logging.debug("fetch_real_name: Checking manifest at " + path)
try:
xml = parse_xml(path)
except XMLElementTree.ParseError:
except (XMLElementTree.ParseError, ValueError):
logging.warning(_("Problem with xml at '{path}'").format(path=path))
continue
app = xml.find('application')
@ -1846,7 +1846,7 @@ def parse_androidmanifests(paths, app):
else:
try:
xml = parse_xml(path)
except Exception:
except (XMLElementTree.ParseError, ValueError):
logging.warning(_("Problem with xml at '{path}'").format(path=path))
continue
if "package" in xml.attrib: