diff options
| author | Christian Heimes <cheimes@redhat.com> | 2016-12-01 14:56:49 +0100 |
|---|---|---|
| committer | Petr Vobornik <pvoborni@redhat.com> | 2016-12-02 09:02:07 +0100 |
| commit | fb307ba582d4e7339b7026cbe26c3b170221e249 (patch) | |
| tree | e156002c6e70095eedc50289d9752e58537fb7b4 /ipapython/certdb.py | |
| parent | 5dc5960e715b378b6090935ba133d6f332427de5 (diff) | |
| download | freeipa-fb307ba582d4e7339b7026cbe26c3b170221e249.tar.gz freeipa-fb307ba582d4e7339b7026cbe26c3b170221e249.tar.xz freeipa-fb307ba582d4e7339b7026cbe26c3b170221e249.zip | |
Add pylint guard to import of ipaplatform in ipapython.certdb
ipaplatform is not available in PyPI wheel packages. The guard silences
a pylint error in wheel pylint tests.
https://fedorahosted.org/freeipa/ticket/6474
Signed-off-by: Christian Heimes <cheimes@redhat.com>
Reviewed-By: Stanislav Laznicka <slaznick@redhat.com>
Diffstat (limited to 'ipapython/certdb.py')
| -rw-r--r-- | ipapython/certdb.py | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/ipapython/certdb.py b/ipapython/certdb.py index 5344e37c5..af98a77f1 100644 --- a/ipapython/certdb.py +++ b/ipapython/certdb.py @@ -32,14 +32,16 @@ from ipapython import ipautil from ipalib import x509 try: - from ipaplatform.paths import paths - CERTUTIL = paths.CERTUTIL - PK12UTIL = paths.PK12UTIL - OPENSSL = paths.OPENSSL + from ipaplatform.paths import paths # pylint: disable=import-error except ImportError: CERTUTIL = '/usr/bin/certutil' PK12UTIL = '/usr/bin/pk12util' OPENSSL = '/usr/bin/openssl' +else: + CERTUTIL = paths.CERTUTIL + PK12UTIL = paths.PK12UTIL + OPENSSL = paths.OPENSSL + CA_NICKNAME_FMT = "%s IPA CA" |