diff options
| author | Endi S. Dewata <edewata@redhat.com> | 2016-03-17 10:59:19 +0100 |
|---|---|---|
| committer | Endi S. Dewata <edewata@redhat.com> | 2016-03-18 22:29:12 +0100 |
| commit | 1b15c725b6e9c5d9057b66e0a2806a7813a8d61b (patch) | |
| tree | 033e632a31eb24c5fa71c94cbe7cd2b14cbdcdc8 /base/common/python/pki | |
| parent | 2e02c078fb57fa806d3ff2bf7a1ed2df34966acc (diff) | |
| download | pki-1b15c725b6e9c5d9057b66e0a2806a7813a8d61b.tar.gz pki-1b15c725b6e9c5d9057b66e0a2806a7813a8d61b.tar.xz pki-1b15c725b6e9c5d9057b66e0a2806a7813a8d61b.zip | |
Renamed PKCS #12 options for consistency.
The pki CLI's --pkcs12 options has been renamed to --pkcs12-file
for consistency with pki-server CLI options.
https://fedorahosted.org/pki/ticket/1742
Diffstat (limited to 'base/common/python/pki')
| -rw-r--r-- | base/common/python/pki/cli/pkcs12.py | 26 | ||||
| -rw-r--r-- | base/common/python/pki/nssdb.py | 4 |
2 files changed, 15 insertions, 15 deletions
diff --git a/base/common/python/pki/cli/pkcs12.py b/base/common/python/pki/cli/pkcs12.py index aa04582f7..2ab603225 100644 --- a/base/common/python/pki/cli/pkcs12.py +++ b/base/common/python/pki/cli/pkcs12.py @@ -46,23 +46,23 @@ class PKCS12ImportCLI(pki.cli.CLI): super(PKCS12ImportCLI, self).__init__( 'import', 'Import PKCS #12 file into NSS database') - def print_help(self): + def print_help(self): # flake8: noqa print('Usage: pki pkcs12-import [OPTIONS]') print() - print(' --pkcs12 PKCS #12 file containing certificates and keys.') - print(' --pkcs12-password Password for the PKCS #12 file.') - print(' --pkcs12-password-file File containing the PKCS #12 password.') - print(' --no-trust-flags Do not include trust flags') - print(' -v, --verbose Run in verbose mode.') - print(' --debug Run in debug mode.') - print(' --help Show help message.') + print(' --pkcs12-file <path> PKCS #12 file containing certificates and keys.') + print(' --pkcs12-password <password> Password for the PKCS #12 file.') + print(' --pkcs12-password-file <path> containing the PKCS #12 password.') + print(' --no-trust-flags Do not include trust flags') + print(' -v, --verbose Run in verbose mode.') + print(' --debug Run in debug mode.') + print(' --help Show help message.') print() def execute(self, args): try: opts, _ = getopt.gnu_getopt(args, 'v', [ - 'pkcs12=', 'pkcs12-password=', 'pkcs12-password-file=', + 'pkcs12-file=', 'pkcs12-password=', 'pkcs12-password-file=', 'no-trust-flags', 'verbose', 'debug', 'help']) except getopt.GetoptError as e: @@ -76,7 +76,7 @@ class PKCS12ImportCLI(pki.cli.CLI): no_trust_flags = False for o, a in opts: - if o == '--pkcs12': + if o == '--pkcs12-file': pkcs12_file = a elif o == '--pkcs12-password': @@ -133,7 +133,7 @@ class PKCS12ImportCLI(pki.cli.CLI): cmd = ['pkcs12-cert-find'] if pkcs12_file: - cmd.extend(['--pkcs12', pkcs12_file]) + cmd.extend(['--pkcs12-file', pkcs12_file]) if pkcs12_password: cmd.extend(['--pkcs12-password', pkcs12_password]) @@ -204,7 +204,7 @@ class PKCS12ImportCLI(pki.cli.CLI): cmd = ['pkcs12-cert-export'] if pkcs12_file: - cmd.extend(['--pkcs12', pkcs12_file]) + cmd.extend(['--pkcs12-file', pkcs12_file]) if pkcs12_password: cmd.extend(['--pkcs12-password', pkcs12_password]) @@ -233,7 +233,7 @@ class PKCS12ImportCLI(pki.cli.CLI): cmd = ['pkcs12-import'] if pkcs12_file: - cmd.extend(['--pkcs12', pkcs12_file]) + cmd.extend(['--pkcs12-file', pkcs12_file]) if pkcs12_password: cmd.extend(['--pkcs12-password', pkcs12_password]) diff --git a/base/common/python/pki/nssdb.py b/base/common/python/pki/nssdb.py index 8d0f96711..43a97146d 100644 --- a/base/common/python/pki/nssdb.py +++ b/base/common/python/pki/nssdb.py @@ -522,7 +522,7 @@ class NSSDatabase(object): cmd.extend([ 'pkcs12-import', - '--pkcs12', pkcs12_file, + '--pkcs12-file', pkcs12_file, '--pkcs12-password-file', password_file ]) @@ -560,7 +560,7 @@ class NSSDatabase(object): cmd.extend(['pkcs12-export']) cmd.extend([ - '--pkcs12', pkcs12_file, + '--pkcs12-file', pkcs12_file, '--pkcs12-password-file', password_file ]) |