PR#2682: don't assume that the hub will report arches for external repos - koji

koji

#2682 don't assume that the hub will report arches for external repos

Merged 3 years ago by tkopecek. Opened 3 years ago by mikem.

mikem/koji taginfo-older-hub into master

make builder code similarly tolerant

Mike McLean • 3 years ago

e8b5697

don't assume that the hub will report arches for external repos

Mike McLean • 3 years ago

08ecc33

builder/kojid

file modified

+1 -1

		`@@ -5553,7 +5553,7 @@`
		`# generate repo url list, starting with our local premerge repo`
		`repos = ['file://' + localdir + '/']`
		`for repo in external_repos:`
		`- if repo['arches'] and arch not in repo['arches'].split():`
		`+ if repo.get('arches') and arch not in repo['arches'].split():`
		`# ignore external repo with non-relevant archlist`
		`continue`
		`ext_url = repo['url']`

cli/koji_cli/commands.py

file modified

+4 -1

		`@@ -4937,7 +4937,10 @@`
		`if external_repos:`
		`print("External repos:")`
		`for rinfo in external_repos:`
		`- if not rinfo['arches']:`
		`+ if 'arches' not in rinfo:`
		`+ # older hubs will not return this field`
		`+ rinfo['arches'] = '-'`
		`+ elif not rinfo['arches']:`
		`rinfo['arches'] = 'inherited from tag'`
		`# TODO else intersection of arches?`
		`print(" %(priority)3i %(external_repo_name)s "`

mikem commented 3 years ago

Fixes https://pagure.io/koji/issue/2681

1 new commit added

make builder code similarly tolerant

3 years ago

mikem commented 3 years ago

I've also added a similar change for the builder code. While we always recommend matching Koji versions between the builder and hub, we should be considerate of the practical problems of applying updates across the full system.