URL: https://github.com/freeipa/freeipa/pull/6142 Author: rcritten Title: #6142: [Backport][ipa-4-9] automember default group: remove --desc parameter Action: opened
PR body: """ This PR was opened automatically because PR #6129 was pushed to master and backport to ipa-4-9 is required. """ To pull the PR as Git branch: git remote add ghfreeipa https://github.com/freeipa/freeipa git fetch ghfreeipa pull/6142/head:pr6142 git checkout pr6142
From dc872c0eea0b44e7051a35ebefd23363f00e0eb9 Mon Sep 17 00:00:00 2001 From: Florence Blanc-Renaud <f...@redhat.com> Date: Mon, 3 Jan 2022 09:28:13 +0100 Subject: [PATCH] automember default group: remove --desc parameter The automember-default-group commands inherit from the automember commands but should not provide the --desc parameter. Remove 'description' from the list of parameters. Fixes: https://pagure.io/freeipa/issue/9068 --- API.txt | 6 ++---- ipaserver/plugins/automember.py | 2 +- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/API.txt b/API.txt index 35d95a709b5..576fa7c51e3 100644 --- a/API.txt +++ b/API.txt @@ -136,9 +136,8 @@ output: Entry('result') output: Output('summary', type=[<type 'unicode'>, <type 'NoneType'>]) output: PrimaryKey('value') command: automember_default_group_remove/1 -args: 0,5,3 +args: 0,4,3 option: Flag('all', autofill=True, cli_name='all', default=False) -option: Str('description?', autofill=False, cli_name='desc') option: Flag('raw', autofill=True, cli_name='raw', default=False) option: StrEnum('type', values=[u'group', u'hostgroup']) option: Str('version?') @@ -146,10 +145,9 @@ output: Entry('result') output: Output('summary', type=[<type 'unicode'>, <type 'NoneType'>]) output: Output('value', type=[<type 'unicode'>]) command: automember_default_group_set/1 -args: 0,6,3 +args: 0,5,3 option: Flag('all', autofill=True, cli_name='all', default=False) option: Str('automemberdefaultgroup', cli_name='default_group') -option: Str('description?', autofill=False, cli_name='desc') option: Flag('raw', autofill=True, cli_name='raw', default=False) option: StrEnum('type', values=[u'group', u'hostgroup']) option: Str('version?') diff --git a/ipaserver/plugins/automember.py b/ipaserver/plugins/automember.py index d1e681f7e29..04f56cd4bee 100644 --- a/ipaserver/plugins/automember.py +++ b/ipaserver/plugins/automember.py @@ -566,7 +566,7 @@ class automember_default_group(automember): def get_params(self): for param in super(automember_default_group, self).get_params(): - if param.name == 'cn': + if param.name == 'cn' or param.name == 'description': continue yield param
_______________________________________________ FreeIPA-devel mailing list -- freeipa-devel@lists.fedorahosted.org To unsubscribe send an email to freeipa-devel-le...@lists.fedorahosted.org Fedora Code of Conduct: https://docs.fedoraproject.org/en-US/project/code-of-conduct/ List Guidelines: https://fedoraproject.org/wiki/Mailing_list_guidelines List Archives: https://lists.fedorahosted.org/archives/list/freeipa-devel@lists.fedorahosted.org Do not reply to spam on the list, report it: https://pagure.io/fedora-infrastructure
