diff options
| author | Tomas Babej <tbabej@redhat.com> | 2014-05-29 10:44:57 +0200 |
|---|---|---|
| committer | Petr Viktorin <pviktori@redhat.com> | 2014-06-16 19:48:19 +0200 |
| commit | c011bccf45ee46c41e6606e391362938271de75a (patch) | |
| tree | 472f5eb65e6c783d0c0bd6bd32c4e9c992525da1 /ipa-client | |
| parent | 49fcd42f8fd71b894a0953a37f10a6c326e16048 (diff) | |
| download | freeipa-c011bccf45ee46c41e6606e391362938271de75a.tar.gz freeipa-c011bccf45ee46c41e6606e391362938271de75a.tar.xz freeipa-c011bccf45ee46c41e6606e391362938271de75a.zip | |
ipaplatform: Change paths dependant on ipaservices to use ipaplatform.paths
https://fedorahosted.org/freeipa/ticket/4052
Reviewed-By: Petr Viktorin <pviktori@redhat.com>
Diffstat (limited to 'ipa-client')
| -rwxr-xr-x | ipa-client/ipa-install/ipa-client-install | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/ipa-client/ipa-install/ipa-client-install b/ipa-client/ipa-install/ipa-client-install index 1e17dee4c..c20ad1a09 100755 --- a/ipa-client/ipa-install/ipa-client-install +++ b/ipa-client/ipa-install/ipa-client-install @@ -42,6 +42,8 @@ try: run, user_input, CalledProcessError, file_exists, dir_exists, realm_to_suffix) from ipaplatform.tasks import tasks + from ipaplatform import services + from ipaplatform.paths import paths from ipapython import ipautil, sysrestore, version, certmonger, ipaldap from ipapython import kernel_keyring from ipapython.config import IPAOptionParser @@ -1991,6 +1993,7 @@ pref("network.negotiate-auth.allow-proxies", true); """ FIREFOX_PREFERENCES_FILENAME = "all-ipa.js" +FIREFOX_PREFERENCES_REL_PATH = "browser/defaults/preferences" def configure_firefox(options, statestore, domain): try: @@ -2001,19 +2004,19 @@ def configure_firefox(options, statestore, domain): # Check user specified location of firefox install directory if options.firefox_dir is not None: pref_path = os.path.join(options.firefox_dir, - ipaservices.FIREFOX_PREFERENCES_REL_PATH) + FIREFOX_PREFERENCES_REL_PATH) if dir_exists(pref_path): preferences_dir = pref_path else: root_logger.error("Directory '%s' does not exists." % pref_path) else: # test if firefox is installed - if file_exists(ipaservices.FIREFOX_EXEC): + if file_exists(paths.FIREFOX): # find valid preferences path - for path in ipaservices.FIREFOX_INSTALL_DIRS: + for path in [paths.LIB_FIREFOX, paths.LIB64_FIREFOX]: pref_path = os.path.join(path, - ipaservices.FIREFOX_PREFERENCES_REL_PATH) + FIREFOX_PREFERENCES_REL_PATH) if dir_exists(pref_path): preferences_dir = pref_path break |