particle-os/debian-koji
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

cli: refactor expected NVR comparison

Browse source 
Instead of expanding "name"-"version"-"release" twice, expand it once
and assign it to a new "expected_nvr" variable.

This makes it easier to read this complex string handling code.
This commit is contained in:
Ken Dreyer 2021-09-30 17:50:19 -04:00 • committed by Tomas Kopecek
parent bcc5de0290
commit 6950c65de9
1 changed files with 4 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

7
cli/koji_cli/commands.py
View file

@ -7454,9 +7454,10 @@ def anon_handle_wait_repo(options, session, args):
warn("Package %s is not in tag %s" % (nvr["name"], tag))
else:
present_nvr = [x["nvr"] for x in data][0]
if present_nvr != "%s-%s-%s" % (nvr["name"], nvr["version"], nvr["release"]):
warn("nvr %s-%s-%s is not current in tag %s\n latest build in %s is %s" %
(nvr["name"], nvr["version"], nvr["release"], tag, tag, present_nvr))
expected_nvr = '%(name)s-%(version)s-%(release)s' % nvr
if present_nvr != expected_nvr:
warn("nvr %s is not current in tag %s\n latest build in %s is %s" %
(expected_nvr, tag, tag, present_nvr))
last_repo = None
repo = session.getRepo(tag_id)