URL: https://github.com/freeipa/freeipa/pull/771 Author: stlaz Title: #771: cert-show: check if certificate_out is in options Action: opened
PR body: """ If --certificate-out was specified on the command line, it will appear among the options. If it was empty, it will be None, though. https://pagure.io/freeipa/issue/6885 """ To pull the PR as Git branch: git remote add ghfreeipa https://github.com/freeipa/freeipa git fetch ghfreeipa pull/771/head:pr771 git checkout pr771
From 46db5c88fa85915f56def93ae7ea20b34b2aac32 Mon Sep 17 00:00:00 2001 From: Stanislav Laznicka <slazn...@redhat.com> Date: Tue, 9 May 2017 17:45:20 +0200 Subject: [PATCH] cert-show: check if certificate_out is in options If --certificate-out was specified on the command line, it will appear among the options. If it was empty, it will be None, though. https://pagure.io/freeipa/issue/6885 --- ipaclient/plugins/cert.py | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/ipaclient/plugins/cert.py b/ipaclient/plugins/cert.py index a4ee9a9..1809de0 100644 --- a/ipaclient/plugins/cert.py +++ b/ipaclient/plugins/cert.py @@ -49,9 +49,14 @@ class CertRetrieveOverride(MethodOverride): ) def forward(self, *args, **options): - certificate_out = options.pop('certificate_out', None) - if certificate_out is not None: + if 'certificate_out' in options: + certificate_out = options.pop('certificate_out') + if certificate_out is None: + raise errors.ValidationError(name='certificate-out', + error=_(u'cannot be empty')) util.check_writable_file(certificate_out) + else: + certificate_out = None result = super(CertRetrieveOverride, self).forward(*args, **options)
-- Manage your subscription for the Freeipa-devel mailing list: https://www.redhat.com/mailman/listinfo/freeipa-devel Contribute to FreeIPA: http://www.freeipa.org/page/Contribute/Code
