diff options
| author | Petr Viktorin <pviktori@redhat.com> | 2014-11-24 15:01:29 +0100 |
|---|---|---|
| committer | Martin Kosek <mkosek@redhat.com> | 2014-11-25 09:20:28 +0100 |
| commit | f287378534c9b3607b08f71b0c3aa17d2e4008dd (patch) | |
| tree | 50a6a3374822e1b0f777bd8590c2804d8f8b14a4 | |
| parent | 192c499ef893b7118a2f7ff9f4c939a9348d5123 (diff) | |
| download | freeipa-f287378534c9b3607b08f71b0c3aa17d2e4008dd.tar.gz freeipa-f287378534c9b3607b08f71b0c3aa17d2e4008dd.tar.xz freeipa-f287378534c9b3607b08f71b0c3aa17d2e4008dd.zip | |
copy_schema_to_ca: Fallback to old import location for ipaplatform.services
This file is copied to older servers that might not have the ipaplatform
refactoring.
Import from the old location if the new one is not available.
https://fedorahosted.org/freeipa/ticket/4763
Reviewed-By: Tomas Babej <tbabej@redhat.com>
| -rwxr-xr-x | install/share/copy-schema-to-ca.py | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/install/share/copy-schema-to-ca.py b/install/share/copy-schema-to-ca.py index fc53fe4cb..1614e1163 100755 --- a/install/share/copy-schema-to-ca.py +++ b/install/share/copy-schema-to-ca.py @@ -15,13 +15,17 @@ import sys import pwd import shutil -from ipaplatform import services from ipapython import ipautil, dogtag from ipapython.ipa_log_manager import root_logger, standard_logging_setup from ipaserver.install.dsinstance import DS_USER, schema_dirname from ipaserver.install.cainstance import PKI_USER from ipalib import api +try: + from ipaplatform import services +except ImportError: + from ipapython import services # pylint: disable=no-name-in-module + SERVERID = "PKI-IPA" SCHEMA_FILENAMES = ( "60kerberos.ldif", |