summaryrefslogtreecommitdiffstats
path: root/client
diff options
context:
space:
mode:
authorJan Cholasta <jcholast@redhat.com>2016-11-23 15:42:08 +0100
committerMartin Basti <mbasti@redhat.com>2016-11-29 14:50:51 +0100
commit70c3cd7f482bee7d5ad12062daa7ad6181a29094 (patch)
treeb61727b8e04364b3c26a859d4a3e691fb32a23eb /client
parentd43b57d2ce8552ed4977dcc33667b4226fe3333b (diff)
downloadfreeipa-70c3cd7f482bee7d5ad12062daa7ad6181a29094.tar.gz
freeipa-70c3cd7f482bee7d5ad12062daa7ad6181a29094.tar.xz
freeipa-70c3cd7f482bee7d5ad12062daa7ad6181a29094.zip
ipaclient: move install modules to the install subpackage
The ipa_certupdate, ipachangeconf, ipadiscovery and ntpconf modules depend on ipaplatform. Move them to ipaclient.install as they are used only from the client installer. https://fedorahosted.org/freeipa/ticket/6474 Reviewed-By: Stanislav Laznicka <slaznick@redhat.com>
Diffstat (limited to 'client')
-rwxr-xr-xclient/ipa-certupdate2
-rwxr-xr-xclient/ipa-client-automount4
2 files changed, 3 insertions, 3 deletions
diff --git a/client/ipa-certupdate b/client/ipa-certupdate
index 072c451bc..d4168ed86 100755
--- a/client/ipa-certupdate
+++ b/client/ipa-certupdate
@@ -18,6 +18,6 @@
# along with this program. If not, see <http://www.gnu.org/licenses/>.
#
-from ipaclient.ipa_certupdate import CertUpdate
+from ipaclient.install.ipa_certupdate import CertUpdate
CertUpdate.run_cli()
diff --git a/client/ipa-client-automount b/client/ipa-client-automount
index e7fddaf03..0dd15b39f 100755
--- a/client/ipa-client-automount
+++ b/client/ipa-client-automount
@@ -40,12 +40,12 @@ from six.moves.urllib.parse import urlsplit
# pylint: enable=import-error
from optparse import OptionParser # pylint: disable=deprecated-module
+
+from ipaclient.install import ipachangeconf, ipadiscovery
from ipalib import api, errors
from ipalib.install import sysrestore
from ipalib.install.kinit import kinit_keytab
from ipapython import ipautil
-from ipaclient import ipadiscovery
-from ipaclient import ipachangeconf
from ipapython.ipa_log_manager import root_logger, standard_logging_setup
from ipapython.dn import DN
from ipaplatform.constants import constants