|
 |
e3ffab |
From 5cea94bf6ba5ecbd9e18b0bf352ca82c62e6ee34 Mon Sep 17 00:00:00 2001
|
|
|
e3ffab |
From: Petr Viktorin <pviktori@redhat.com>
|
|
|
e3ffab |
Date: Mon, 24 Nov 2014 15:01:29 +0100
|
|
|
e3ffab |
Subject: [PATCH] copy_schema_to_ca: Fallback to old import location for
|
|
|
e3ffab |
ipaplatform.services
|
|
|
e3ffab |
|
|
|
e3ffab |
This file is copied to older servers that might not have the ipaplatform
|
|
|
e3ffab |
refactoring.
|
|
|
e3ffab |
Import from the old location if the new one is not available.
|
|
|
e3ffab |
|
|
|
e3ffab |
https://fedorahosted.org/freeipa/ticket/4763
|
|
|
e3ffab |
|
|
|
e3ffab |
Reviewed-By: Tomas Babej <tbabej@redhat.com>
|
|
|
e3ffab |
---
|
|
|
e3ffab |
install/share/copy-schema-to-ca.py | 6 +++++-
|
|
|
e3ffab |
1 file changed, 5 insertions(+), 1 deletion(-)
|
|
|
e3ffab |
|
|
|
e3ffab |
diff --git a/install/share/copy-schema-to-ca.py b/install/share/copy-schema-to-ca.py
|
|
|
e3ffab |
index fc53fe4cb52486cc618bec77aabe8283ad5eadbc..1614e11636c2f52e231ea2ff40d882209194c60a 100755
|
|
|
e3ffab |
--- a/install/share/copy-schema-to-ca.py
|
|
|
e3ffab |
+++ b/install/share/copy-schema-to-ca.py
|
|
|
e3ffab |
@@ -15,13 +15,17 @@ import sys
|
|
|
e3ffab |
import pwd
|
|
|
e3ffab |
import shutil
|
|
|
e3ffab |
|
|
|
e3ffab |
-from ipaplatform import services
|
|
|
e3ffab |
from ipapython import ipautil, dogtag
|
|
|
e3ffab |
from ipapython.ipa_log_manager import root_logger, standard_logging_setup
|
|
|
e3ffab |
from ipaserver.install.dsinstance import DS_USER, schema_dirname
|
|
|
e3ffab |
from ipaserver.install.cainstance import PKI_USER
|
|
|
e3ffab |
from ipalib import api
|
|
|
e3ffab |
|
|
|
e3ffab |
+try:
|
|
|
e3ffab |
+ from ipaplatform import services
|
|
|
e3ffab |
+except ImportError:
|
|
|
e3ffab |
+ from ipapython import services # pylint: disable=no-name-in-module
|
|
|
e3ffab |
+
|
|
|
e3ffab |
SERVERID = "PKI-IPA"
|
|
|
e3ffab |
SCHEMA_FILENAMES = (
|
|
|
e3ffab |
"60kerberos.ldif",
|
|
|
e3ffab |
--
|
|
|
e3ffab |
2.1.0
|
|
|
e3ffab |
|