diff options
| author | Endi S. Dewata <edewata@redhat.com> | 2016-01-22 17:34:19 +0100 |
|---|---|---|
| committer | Matthew Harmsen <mharmsen@pki.usersys.redhat.com> | 2016-02-22 20:20:11 -0700 |
| commit | 708189e54a505ce0baf9a96ff3ad8b6a9942936e (patch) | |
| tree | b3733a9913874550bd7cd14cb17342e3334bf02d /base/server/python/pki/server/cli | |
| parent | 5207fe7a28462f24ba47301a717af15057f3be0e (diff) | |
| download | pki-708189e54a505ce0baf9a96ff3ad8b6a9942936e.tar.gz pki-708189e54a505ce0baf9a96ff3ad8b6a9942936e.tar.xz pki-708189e54a505ce0baf9a96ff3ad8b6a9942936e.zip | |
Renamed pki.nss into pki.nssdb.
The pki.nss module has been renamed into pki.nssdb to prevent
conflicts with the nss module.
https://fedorahosted.org/pki/ticket/456
(cherry picked from commit 9609f4e6035d3cdff19a0f78caee2d08b095c8ba)
Diffstat (limited to 'base/server/python/pki/server/cli')
| -rw-r--r-- | base/server/python/pki/server/cli/subsystem.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/base/server/python/pki/server/cli/subsystem.py b/base/server/python/pki/server/cli/subsystem.py index cb27adc1d..3af19269b 100644 --- a/base/server/python/pki/server/cli/subsystem.py +++ b/base/server/python/pki/server/cli/subsystem.py @@ -29,7 +29,7 @@ import string import sys import pki.cli -import pki.nss +import pki.nssdb import pki.server @@ -536,13 +536,13 @@ class SubsystemCertExportCLI(pki.cli.CLI): if cert_file: - cert_data = pki.nss.convert_cert(subsystem_cert['data'], 'base64', 'pem') + cert_data = pki.nssdb.convert_cert(subsystem_cert['data'], 'base64', 'pem') with open(cert_file, 'w') as f: f.write(cert_data) if csr_file: - csr_data = pki.nss.convert_csr(subsystem_cert['request'], 'base64', 'pem') + csr_data = pki.nssdb.convert_csr(subsystem_cert['request'], 'base64', 'pem') with open(csr_file, 'w') as f: f.write(csr_data) |