class PackageListEntry(object):
def __init__(self, name, package_type, section, component, priority, **other):
self.name = name
- self.package_type = package_type
+ self.type = package_type
self.section = section
self.component = component
self.priority = priority
def built_in_suite(self, suite):
built = False
for arch in suite.architectures:
+ if arch.arch_string == 'source':
+ continue
built_on_arch = self.built_on_architecture(arch.arch_string)
if built_on_arch:
return True
class PackageList(object):
def __init__(self, source):
- self._source = source
- if 'Package-List' in self._source:
- self._parse()
- elif 'Binary' in self._source:
- self._parse_fallback()
+ if 'Package-List' in source:
+ self._parse(source)
+ elif 'Binary' in source:
+ self._parse_fallback(source)
else:
raise InvalidSource('Source package has neither Package-List nor Binary field.')
self.fallback = any(entry.architectures is None for entry in self.package_list)
- def _parse(self):
+ def _binaries(self, source):
+ return set(name.strip() for name in source['Binary'].split(","))
+
+ def _parse(self, source):
self.package_list = []
- binaries_binary = set(self._source['Binary'].split())
+ binaries_binary = self._binaries(source)
binaries_package_list = set()
- for line in self._source['Package-List'].split("\n"):
+ for line in source['Package-List'].split("\n"):
if not line:
continue
fields = line.split()
# <name> <type> <component/section> <priority> [arch=<arch>[,<arch>]...]
name = fields[0]
package_type = fields[1]
- component, section = extract_component_from_section(fields[2])
+ section, component = extract_component_from_section(fields[2])
priority = fields[3]
other = dict(kv.split('=', 1) for kv in fields[4:])
if name in binaries_package_list:
raise InvalidSource("Package-List has two entries for '{0}'.".format(name))
if name not in binaries_binary:
- raise InvalidSource("Package-List lists {0} which is not listed in Binaries.".format(name))
+ raise InvalidSource("Package-List lists {0} which is not listed in Binary.".format(name))
binaries_package_list.add(name)
entry = PackageListEntry(name, package_type, section, component, priority, **other)
if len(binaries_binary) != len(binaries_package_list):
raise InvalidSource("Package-List and Binaries fields have a different number of entries.")
- def _parse_fallback(self):
+ def _parse_fallback(self, source):
self.package_list = []
- for binary in self._source['Binary'].split():
+ for binary in self._binaries(source):
name = binary
package_type = None
component = None