From fb307ba582d4e7339b7026cbe26c3b170221e249 Mon Sep 17 00:00:00 2001 From: Christian Heimes Date: Thu, 1 Dec 2016 14:56:49 +0100 Subject: 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 Reviewed-By: Stanislav Laznicka --- ipapython/certdb.py | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) (limited to 'ipapython') 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" -- cgit