From 51b34d5c4249e540510993fe600d222f22fcda16 Mon Sep 17 00:00:00 2001 From: Rob Crittenden Date: Wed, 4 Apr 2012 14:57:22 -0400 Subject: Make revocation_reason required when revoking a certificate. This will prevent errors if an empty reason is provided and it is set by default one doesn't have to always set it on the command-line. https://fedorahosted.org/freeipa/ticket/2597 --- API.txt | 2 +- VERSION | 2 +- ipalib/plugins/cert.py | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/API.txt b/API.txt index 1464bc60..c2b17942 100644 --- a/API.txt +++ b/API.txt @@ -433,7 +433,7 @@ output: Output('result', , None) command: cert_revoke args: 1,1,1 arg: Str('serial_number') -option: Int('revocation_reason?', autofill=True, default=0, maxvalue=10, minvalue=0) +option: Int('revocation_reason', autofill=True, default=0, maxvalue=10, minvalue=0) output: Output('result', None, None) command: cert_show args: 1,1,1 diff --git a/VERSION b/VERSION index 46d98eed..77572ea6 100644 --- a/VERSION +++ b/VERSION @@ -79,4 +79,4 @@ IPA_DATA_VERSION=20100614120000 # # ######################################################## IPA_API_VERSION_MAJOR=2 -IPA_API_VERSION_MINOR=32 +IPA_API_VERSION_MINOR=33 diff --git a/ipalib/plugins/cert.py b/ipalib/plugins/cert.py index 7a388812..75eace24 100644 --- a/ipalib/plugins/cert.py +++ b/ipalib/plugins/cert.py @@ -526,7 +526,7 @@ class cert_revoke(VirtualCommand): # FIXME: The default is 0. Is this really an Int param? takes_options = ( - Int('revocation_reason?', + Int('revocation_reason', label=_('Reason'), doc=_('Reason for revoking the certificate (0-10)'), minvalue=0, -- cgit