summary |
shortlog |
log |
commit | commitdiff |
tree
raw |
patch |
inline | side by side (from parent 1:
2ad44c7)
When generating the sources and packages file, just generate those
that should exist, according to the component_suite mapping.
Signed-off-by: Tollef Fog Heen <tfheen@varnish-software.com>
force = Options.has_key("Force") and Options["Force"]
force = Options.has_key("Force") and Options["Force"]
- component_ids = [ c.component_id for c in session.query(Component).all() ]
def parse_results(message):
# Split out into (code, msg)
def parse_results(message):
# Split out into (code, msg)
logger.log(['E: ', msg])
for s in suites:
logger.log(['E: ', msg])
for s in suites:
+ component_ids = [ c.component_id for c in s.components ]
if s.untouchable and not force:
import utils
utils.fubar("Refusing to touch %s (untouchable and not forced)" % s.suite_name)
if s.untouchable and not force:
import utils
utils.fubar("Refusing to touch %s (untouchable and not forced)" % s.suite_name)
out.write("Architectures: %s\n" % (" ".join([a.arch_string for a in architectures])))
out.write("Architectures: %s\n" % (" ".join([a.arch_string for a in architectures])))
- components = [ c.component_name for c in session.query(Component) ]
+ components = [ c.component_name for c in suite.components ]
out.write("Components: %s\n" % (" ".join(components)))
out.write("Components: %s\n" % (" ".join(components)))
'changelogs_text',
'changes',
'component',
'changelogs_text',
'changes',
'component',
'config',
'dsc_files',
'external_overrides',
'config',
'dsc_files',
'external_overrides',
srcformats = relation(SrcFormat, secondary=self.tbl_suite_src_formats,
backref=backref('suites', lazy='dynamic')),
archive = relation(Archive, backref='suites'),
srcformats = relation(SrcFormat, secondary=self.tbl_suite_src_formats,
backref=backref('suites', lazy='dynamic')),
archive = relation(Archive, backref='suites'),
- acls = relation(ACL, secondary=self.tbl_suite_acl_map, collection_class=set)),
+ acls = relation(ACL, secondary=self.tbl_suite_acl_map, collection_class=set),
+ components = relation(Component, secondary=self.tbl_component_suite,
+ order_by=self.tbl_component.c.ordering,
+ backref=backref('suite'))),
extension = validator)
mapper(Uid, self.tbl_uid,
extension = validator)
mapper(Uid, self.tbl_uid,