mirror of
https://pagure.io/fm-orchestrator.git
synced 2026-04-05 03:38:12 +08:00
Use API result structure for dependencies.
Finds runtime and build dependencies in PDC UnreleasedVariant objects
in the fields 'runtime_deps' and 'build_deps'. Both are lists of
dictionaries, each with currently one field 'dependency' which contains
the name of the other variant on which this one depends, with an
optional version constraint. E.g.:
{
"variant_id": ...,
...
"runtime_deps": [
{
"dependency": "foo>=2"
}
],
"build_deps": [
{
"dependency": "foo>=2"
}
]
}
Signed-off-by: Nils Philippsen <nils@redhat.com>
This commit is contained in:
12
rida/pdc.py
12
rida/pdc.py
@@ -160,8 +160,9 @@ def get_module_dependencies(session, module_info):
|
||||
|
||||
deps = []
|
||||
module_info = get_module(session, module_info)
|
||||
if 'deps' in module_info and module_info['deps']:
|
||||
deps = module_depsolving_wrapper(session, module_info['deps'])
|
||||
if module_info.get('runtime_deps'):
|
||||
deps = [x['dependency'] for x in module_info['runtime_deps']]
|
||||
deps = module_depsolving_wrapper(session, deps)
|
||||
|
||||
return deps
|
||||
|
||||
@@ -177,9 +178,8 @@ def get_module_build_dependencies(session, module_info):
|
||||
|
||||
deps = []
|
||||
module_info = get_module(session, module_info)
|
||||
if 'build_deps' in module_info and module_info['build_deps']:
|
||||
deps = module_depsolving_wrapper(session, module_info['build_deps'])
|
||||
if module_info.get('build_deps'):
|
||||
deps = [x['dependency'] for x in module_info['build_deps']]
|
||||
deps = module_depsolving_wrapper(session, deps)
|
||||
|
||||
return deps
|
||||
|
||||
|
||||
|
||||
Reference in New Issue
Block a user