Исправлено получение DESCRIPTION из eix в случае

если eix возвращает мусор вместе/вместо xml
master3.3
Mike khiretskiy 10 years ago
parent 930baf2368
commit bc208e2e09

@ -29,6 +29,7 @@ from calculate.lib.utils.files import (getProgPath, STDOUT,
PercentProgress, process, readFile,
readLinesFile)
from calculate.lib.utils.common import cmpVersion
from calculate.lib.utils.tools import ignore
from contextlib import closing
@ -598,7 +599,9 @@ class PackageInformation:
pkg_list = "|".join(
[x['CATEGORY/PN'].replace("+", r"\+") for x in self.query_packages])
output = pexpect.spawn(self.eix_cmd, ["--xml", pkg_list]).read()
xml = ET.fromstring(output)
re_cut = re.compile("^.*?(?=<\?xml version)",re.S)
with ignore(ET.ParseError):
xml = ET.fromstring(re_cut.sub('',output))
for pkg in self.query_packages:
cat_pn = pkg['CATEGORY/PN']
if not cat_pn in self.information_cache:

Loading…
Cancel
Save