Lubuntu/britney2-ubuntu
8
0
Fork 0
mirror of https://git.launchpad.net/~ubuntu-release/britney/+git/britney2-ubuntu synced 2025-05-18 22:11:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

britney.py: Extract a _parse_provides method

Browse Source 
Signed-off-by: Niels Thykier <niels@thykier.net>
This commit is contained in:
Niels Thykier 2016-05-07 12:30:59 +00:00
parent 7ccbfe2fdf
commit 58b704f3d0
1 changed files with 21 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
britney.py
View File

@ -724,6 +724,26 @@ class Britney(object):
return sources return sources
def _parse_provides(self, pkg_id, provides_raw):
parts = apt_pkg.parse_depends(provides_raw, False)
nprov = []
for or_clause in parts:
if len(or_clause) != 1:
msg = "Ignoring invalid provides in %s: Alternatives [%s]" % (str(pkg_id), str(or_clause))
self.log(msg, type='W')
continue
for part in or_clause:
provided, provided_version, op = part
if op != '' and op != '=':
msg = "Ignoring invalid provides in %s: %s (%s %s)" % (str(pkg_id), provided, op, provided_version)
self.log(msg, type='W')
continue
provided = sys.intern(provided)
provided_version = sys.intern(provided_version)
part = (provided, provided_version, sys.intern(op))
nprov.append(part)
return nprov
def _read_packages_file(self, filename, arch, srcdist, packages=None, intern=sys.intern): def _read_packages_file(self, filename, arch, srcdist, packages=None, intern=sys.intern):
self.log("Loading binary packages from %s" % filename) self.log("Loading binary packages from %s" % filename)
@ -797,24 +817,7 @@ class Britney(object):
provides_raw = get_field('Provides') provides_raw = get_field('Provides')
if provides_raw: if provides_raw:
parts = apt_pkg.parse_depends(provides_raw, False) provides = self._parse_provides(pkg_id, provides_raw)
nprov = []
for or_clause in parts:
if len(or_clause) != 1:
msg = "Ignoring invalid provides in %s: Alternatives [%s]" % (str(pkg_id), str(or_clause))
self.log(msg, type='W')
continue
for part in or_clause:
provided, provided_version, op = part
if op != '' and op != '=':
msg = "Ignoring invalid provides in %s: %s (%s %s)" % (str(pkg_id), provided, op, version)
self.log(msg, type='W')
continue
provided = intern(provided)
provided_version = intern(provided_version)
part = (provided, provided_version, intern(op))
nprov.append(part)
provides = nprov
else: else:
provides = [] provides = []