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

Fix editSidetag fstring variable formats and fix test unit tests

Browse source 
Fixes: https://pagure.io/koji/issue/3748
This commit is contained in:
Jana Cupova 2023-03-23 21:19:14 +01:00
parent b208e77f6a
commit 889770e74c
2 changed files with 162 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

4
plugins/hub/sidetag_hub.py
View file

@ -290,7 +290,7 @@ def editSideTag(sidetag, debuginfo=None, rpm_macros=None, remove_rpm_macros=None
f"{type(rpm_macros_allowed)}")
for macro in rpm_macros_allowed:
if not isinstance(macro, str):
raise koji.GenericError(f"Allowed rpm macro list {rpm_macros_allowed:r} "
raise koji.GenericError(f"Allowed rpm macro list {rpm_macros_allowed!r} "
f"is invalid for {parent['name']}.")
if not rpm_macros_allowed:
@ -303,7 +303,7 @@ def editSideTag(sidetag, debuginfo=None, rpm_macros=None, remove_rpm_macros=None
convert_value(rpm_macros, cast=dict, check_only=True)
for macro, value in rpm_macros.items():
if not _valid_rpm_macro_name(macro):
raise koji.GenericError(f"Invalid macro name {macro:r}")
raise koji.GenericError(f"Invalid macro name {macro!r}")
if not multi_fnmatch(macro, rpm_macros_allowed):
raise koji.GenericError(f"RPM macro {macro} editing is not allowed via parent tag")
kwargs['extra']['rpm.macro.%s' % macro] = value