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

edit rpm macros

Browse source
This commit is contained in:
Tomas Kopecek 2020-03-09 16:48:19 +01:00
parent f603231450
commit fa4a4a6339
2 changed files with 40 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

25
plugins/cli/sidetag_cli.py
View file

@ -105,12 +105,31 @@ def handle_edit_sidetag(options, session, args):
parser.add_argument("--debuginfo", action="store_true", default=None,
help=_("Generate debuginfo repository"))
parser.add_argument("--no-debuginfo", action="store_false", dest="debuginfo")
parser.add_argument("--rpm-macro", action="append", default=[], metavar="key=value",
help=_("Set tag-specific rpm macros"))
parser.add_argument("--remove-rpm-macro", action="append", default=[], metavar="key",
help=_("Remove rpm macros"))
opts = parser.parse_args(args)
if opts.debuginfo is None:
parser.error("--debuginfo or --no-debuginfo must be specified")
if opts.debuginfo is None and not opts.add_rpm_macro and not opts.remove_rpm_macros:
parser.error("At least one option needs to be specified")
activate_session(session, options)
session.editSideTag(opts.sidetag, debuginfo=opts.debuginfo)
kwargs = {}
if opts.debuginfo is not None:
kwargs['debuginfo'] = opts.debuginfo
if options.add_rpm_macro:
rpm_macros = {]
for xopt in opts.add_rpm_macro:
key, value = xopt.split('=', 1)
value = arg_filter(value)
rpm_macros[key] = value
kwargs['rpm_macros'] = rpm_macros
if opts.remove_rpm_macros:
kwargs['remove_rpm_macros'] = opts.remove_rpm_macros
session.editSideTag(opts.sidetag, **kwargs)

20
plugins/hub/sidetag_hub.py
View file

@ -209,9 +209,10 @@ def listSideTags(basetag=None, user=None, queryOpts=None):
@export
def editSideTag(sidetag, debuginfo=None):
def editSideTag(sidetag, debuginfo=None, rpm_macros=None, remove_rpm_macros=None):
"""Restricted ability to modify sidetags, parent tag must have:
sidetag_debuginfo_allowed: 1
sidetag_rpm_macros_allowed: 1
in extra, if modifying functions should work. For blocking/unblocking
further policy must be compatible with these operations.
@ -219,6 +220,10 @@ def editSideTag(sidetag, debuginfo=None):
:type sidetag: int or str
:param debuginfo: set or disable debuginfo repo generation
:type debuginfo: bool
:param rpm_macros: add/update rpms macros in extra
:type rpm_macros: dict
:param remove_rpm_macros: remove rpm macros from extra
:type remove_rpm_macros: list of str
"""
context.session.assertLogin()
@ -235,8 +240,19 @@ def editSideTag(sidetag, debuginfo=None):
if debuginfo is not None and not parent['extra'].get('sidetag_debuginfo_allowed'):
raise koji.GenericError("Debuginfo setting is not allowed in parent tag.")
if ((rpm_macros is not None or remove_rpm_macros is not None)
and not parent['extra'].get('sidetag_rpm_macros_allowed')):
raise koji.GenericError("RPM macros change is not allowed in parent tag.")
kwargs = {'extra': {}}
if debuginfo is not None:
_edit_tag(sidetag, extra={'with_debuginfo': bool(debuginfo)})
kwargs['extra']['with_debuginfo'] = bool(debuginfo)
for macro, value in rpm_macros.items():
kwargs['extra']['rpm.macro.%s' % macro] = value
if remove_rpm_macros:
kwargs['remove_extra'] = ['rpm.macro.%s' % m for m in remove_rpm_macros]
_edit_tag(sidetag, **kwargs)
def handle_sidetag_untag(cbtype, *args, **kws):