yudaike/openSUSE-release-tools
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix osc.core.repository_path_expand

Browse Source 
The algorithm was wrong, it didn't add non-recursively entered paths to the
list. The correct algorithm even allows for a simpler implementation.
This commit is contained in:
Fabian Vogt 2020-06-05 14:48:36 +02:00
parent e09639bcb7
commit c5f65e117c
1 changed files with 11 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
osclib/core.py
View File

@ -409,31 +409,20 @@ def attribute_value_delete(apiurl, project, name, namespace='OSRT', package=None
http_DELETE(makeurl( http_DELETE(makeurl(
apiurl, list(filter(None, ['source', project, package, '_attribute', namespace + ':' + name])))) apiurl, list(filter(None, ['source', project, package, '_attribute', namespace + ':' + name]))))
@memoize(session=True)
def _repository_path_expand(apiurl, project, repo):
"""Recursively list underlying projects."""
repos = OrderedDict()
meta = ET.fromstringlist(show_project_meta(apiurl, project))
for path in meta.findall('.//repository[@name="{}"]/path'.format(repo)):
rp = repository_path_expand(apiurl, path.get('project', project), path.get('repository'))
for project, repo in rp:
# only the last repo for a project is remembered by OBS
if project in repos:
del repos[project]
repos[project] = repo
return repos
@memoize(session=True) @memoize(session=True)
def repository_path_expand(apiurl, project, repo): def repository_path_expand(apiurl, project, repo):
"""Recursively list underlying projects.""" """Recursively list underlying projects."""
repodict = _repository_path_expand(apiurl, project, repo) repos = [[project, repo]]
repos = [] meta = ET.fromstringlist(show_project_meta(apiurl, project))
repos.append([project, repo]) paths = meta.findall('.//repository[@name="{}"]/path'.format(repo))
for project, repo in repodict.items():
repos.append([project, repo]) # The listed paths are taken as-is, except for the last one...
for path in paths[:-1]:
repos += [[path.get('project', project), path.get('repository')]]
# ...which is expanded recursively
if len(paths) > 0:
repos += repository_path_expand(apiurl, paths[-1].get('project', project), paths[-1].get('repository'))
return repos return repos
@memoize(session=True) @memoize(session=True)