diff options
| author | Jan Cholasta <jcholast@redhat.com> | 2016-11-23 14:01:07 +0100 |
|---|---|---|
| committer | Martin Basti <mbasti@redhat.com> | 2016-11-29 14:50:51 +0100 |
| commit | 528012fe8a8976961203021ef36353b7a4c3b8a8 (patch) | |
| tree | c208c28b82e1d5a3e4e8fd5bf064664cb8b32075 /ipaplatform | |
| parent | 6e50fae9ec6dea35e12a65dbc46228a1e6276e07 (diff) | |
| download | freeipa-528012fe8a8976961203021ef36353b7a4c3b8a8.tar.gz freeipa-528012fe8a8976961203021ef36353b7a4c3b8a8.tar.xz freeipa-528012fe8a8976961203021ef36353b7a4c3b8a8.zip | |
ipapython: remove hard dependency on ipaplatform
Use hard-coded paths to certutil, pk12util and openssl in certdb if
ipaplatform is not available.
Hard-coded the path to setpasswd in ipautil.run() doc string.
Remove ipaplatform dependency from ipapython's setup.py and add ipapython
dependency to ipaplatform's setup.py.
https://fedorahosted.org/freeipa/ticket/6474
Reviewed-By: Stanislav Laznicka <slaznick@redhat.com>
Diffstat (limited to 'ipaplatform')
| -rw-r--r-- | ipaplatform/base/paths.py | 1 | ||||
| -rw-r--r-- | ipaplatform/setup.py | 1 |
2 files changed, 1 insertions, 1 deletions
diff --git a/ipaplatform/base/paths.py b/ipaplatform/base/paths.py index 47f518577..ac22f3e97 100644 --- a/ipaplatform/base/paths.py +++ b/ipaplatform/base/paths.py @@ -172,7 +172,6 @@ class BasePathNamespace(object): ODS_SIGNER = "/usr/sbin/ods-signer" OPENSSL = "/usr/bin/openssl" PK12UTIL = "/usr/bin/pk12util" - SETPASSWD = "/usr/bin/setpasswd" SIGNTOOL = "/usr/bin/signtool" SOFTHSM2_UTIL = "/usr/bin/softhsm2-util" SSLGET = "/usr/bin/sslget" diff --git a/ipaplatform/setup.py b/ipaplatform/setup.py index 97311de7f..b28ac8c65 100644 --- a/ipaplatform/setup.py +++ b/ipaplatform/setup.py @@ -42,6 +42,7 @@ if __name__ == '__main__': install_requires=[ "cffi", # "ipalib", # circular dependency + "ipapython", "pyasn1", "python-nss", "six", |