mirror of
https://pagure.io/fm-orchestrator.git
synced 2026-04-10 14:20:00 +08:00
Merge #431 [Waits on upgrade of PDC and pdc-updater] Query only for active deps in PDC.
This commit is contained in:
@@ -170,6 +170,8 @@ def get_module(session, module_info, strict=False):
|
||||
)
|
||||
if module_info.get('variant_release'):
|
||||
query['variant_release'] = module_info['variant_release']
|
||||
if module_info.get('active'):
|
||||
query['active'] = module_info['active']
|
||||
|
||||
retval = session['unreleasedvariants'](page_size=-1, **query) # ordering=variant_release...
|
||||
|
||||
@@ -325,6 +327,8 @@ def module_depsolving_wrapper(session, modules, strict=True):
|
||||
'name': name,
|
||||
'version': details['stream'],
|
||||
'release': details['version'],
|
||||
# Only return details about module builds that finished
|
||||
'active': True,
|
||||
}
|
||||
module_list.append(modified_dep)
|
||||
|
||||
@@ -352,10 +356,13 @@ def get_module_build_dependencies(session, module_info, strict=False):
|
||||
'The module "{0!r}" did not contain its modulemd or did not have '
|
||||
'its xmd attribute filled out in PDC'.format(module_info))
|
||||
|
||||
deps = [dict(name=dep_name, version=dep_info['stream'],
|
||||
release=dep_info['version'])
|
||||
for dep_name, dep_info in
|
||||
queried_mmd.xmd['mbs']['buildrequires'].items()]
|
||||
buildrequires = queried_mmd.xmd['mbs']['buildrequires']
|
||||
deps = [dict(
|
||||
name=dep_name,
|
||||
version=dep_info['stream'],
|
||||
release=dep_info['version'],
|
||||
) for dep_name, dep_info in buildrequires.items()]
|
||||
|
||||
deps = module_depsolving_wrapper(session, deps, strict=strict)
|
||||
|
||||
return deps
|
||||
|
||||
Reference in New Issue
Block a user