diff options
| author | Jan Cholasta <jcholast@redhat.com> | 2016-11-22 16:06:45 +0100 |
|---|---|---|
| committer | Martin Basti <mbasti@redhat.com> | 2016-11-29 14:50:51 +0100 |
| commit | d6b755e3fcaf32158f4ee36d45e3344b4a03fbc2 (patch) | |
| tree | e14721c8fee437c408319276568954cf81310600 /install/share | |
| parent | f919ab4ee0ec26d77ee6978e75de5daba4073402 (diff) | |
| download | freeipa-d6b755e3fcaf32158f4ee36d45e3344b4a03fbc2.tar.gz freeipa-d6b755e3fcaf32158f4ee36d45e3344b4a03fbc2.tar.xz freeipa-d6b755e3fcaf32158f4ee36d45e3344b4a03fbc2.zip | |
ipautil: remove SHARE_DIR and PLUGIN_SHARE_DIR
SHARE_DIR and PLUGIN_SHARE_DIR depend on ipaplatform.
Replace all uses of SHARE_DIR with paths.USR_SHARE_IPA_DIR and remove
both SHARE_DIR and PLUGIN_SHARE_DIR.
https://fedorahosted.org/freeipa/ticket/6474
Reviewed-By: Stanislav Laznicka <slaznick@redhat.com>
Diffstat (limited to 'install/share')
| -rwxr-xr-x | install/share/copy-schema-to-ca.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/install/share/copy-schema-to-ca.py b/install/share/copy-schema-to-ca.py index 9edc0cd08..658204bc1 100755 --- a/install/share/copy-schema-to-ca.py +++ b/install/share/copy-schema-to-ca.py @@ -17,6 +17,7 @@ import shutil from hashlib import sha1 +from ipaplatform.paths import paths from ipapython import ipautil from ipapython.ipa_log_manager import root_logger, standard_logging_setup from ipaserver.install.dsinstance import schema_dirname @@ -65,7 +66,7 @@ def add_ca_schema(): pki_pent = pwd.getpwnam(PKI_USER) ds_pent = pwd.getpwnam(DS_USER) for schema_fname in SCHEMA_FILENAMES: - source_fname = os.path.join(ipautil.SHARE_DIR, schema_fname) + source_fname = os.path.join(paths.USR_SHARE_IPA_DIR, schema_fname) target_fname = os.path.join(schema_dirname(SERVERID), schema_fname) if not os.path.exists(source_fname): root_logger.debug('File does not exist: %s', source_fname) |