diff options
| author | Felipe Barreto <fbarreto@redhat.com> | 2017-10-20 13:22:33 +0200 |
|---|---|---|
| committer | Tomas Krizek <tkrizek@redhat.com> | 2017-10-23 18:11:30 +0200 |
| commit | be66eadb621426c2e39026e860fd06760df1972d (patch) | |
| tree | 0137395ce7f1e1ba0f23ea874e4c4c5a1d755936 /ipalib | |
| parent | b29db07c3b3d8937f53684fdbba985fec525d69d (diff) | |
| download | freeipa-be66eadb621426c2e39026e860fd06760df1972d.tar.gz freeipa-be66eadb621426c2e39026e860fd06760df1972d.tar.xz freeipa-be66eadb621426c2e39026e860fd06760df1972d.zip | |
Fixing tox and pylint errors
Fixing import errors introduced by commits
icac3475a0454b730d6e5b2093c2e63d395acd387 and
0b7d9c5.
https://pagure.io/freeipa/issue/7132
Reviewed-By: Christian Heimes <cheimes@redhat.com>
Reviewed-By: Tomas Krizek <tkrizek@redhat.com>
Diffstat (limited to 'ipalib')
| -rw-r--r-- | ipalib/util.py | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/ipalib/util.py b/ipalib/util.py index 91d6e469a..90605b12e 100644 --- a/ipalib/util.py +++ b/ipalib/util.py @@ -55,10 +55,6 @@ from ipalib.constants import ( TLS_VERSIONS, TLS_VERSION_MINIMAL, TLS_HIGH_CIPHERS ) from ipalib.text import _ -# pylint: disable=ipa-forbidden-import -from ipalib.install import sysrestore -from ipaplatform.paths import paths -# pylint: enable=ipa-forbidden-import from ipapython.ssh import SSHPublicKey from ipapython.dn import DN, RDN from ipapython.dnsutil import DNSName @@ -68,6 +64,9 @@ from ipapython.admintool import ScriptError if six.PY3: unicode = str +_IPA_CLIENT_SYSRESTORE = "/var/lib/ipa-client/sysrestore" +_IPA_DEFAULT_CONF = "/etc/ipa/default.conf" + logger = logging.getLogger(__name__) @@ -1078,8 +1077,9 @@ def check_client_configuration(): """ Check if IPA client is configured on the system. """ - fstore = sysrestore.FileStore(paths.IPA_CLIENT_SYSRESTORE) - if not fstore.has_files() and not os.path.exists(paths.IPA_DEFAULT_CONF): + if (not os.path.isfile(_IPA_DEFAULT_CONF) or + not os.path.isdir(_IPA_CLIENT_SYSRESTORE) or + not os.listdir(_IPA_CLIENT_SYSRESTORE)): raise ScriptError('IPA client is not configured on this system') |