summaryrefslogtreecommitdiffstats
path: root/ipaserver/install/server
diff options
context:
space:
mode:
authorStanislav Laznicka <slaznick@redhat.com>2016-11-07 12:30:19 +0100
committerJan Cholasta <jcholast@redhat.com>2016-11-11 12:17:25 +0100
commit928a4aa6f281df55e0f655d5cbf5a327794507b6 (patch)
tree0989f4affa1786878895fdd5f591492777918c8f /ipaserver/install/server
parent0b68899779e4500d231e974f11e428f8a3577538 (diff)
downloadfreeipa-928a4aa6f281df55e0f655d5cbf5a327794507b6.tar.gz
freeipa-928a4aa6f281df55e0f655d5cbf5a327794507b6.tar.xz
freeipa-928a4aa6f281df55e0f655d5cbf5a327794507b6.zip
Use os.path.join instead of concatenation
https://fedorahosted.org/freeipa/ticket/6392 Reviewed-By: Martin Basti <mbasti@redhat.com> Reviewed-By: Jan Cholasta <jcholast@redhat.com>
Diffstat (limited to 'ipaserver/install/server')
-rw-r--r--ipaserver/install/server/replicainstall.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/ipaserver/install/server/replicainstall.py b/ipaserver/install/server/replicainstall.py
index f353e5c0f..2b97b1eca 100644
--- a/ipaserver/install/server/replicainstall.py
+++ b/ipaserver/install/server/replicainstall.py
@@ -663,7 +663,7 @@ def install_check(installer):
installer._top_dir = config.top_dir
installer._config = config
- ca_enabled = ipautil.file_exists(config.dir + "/cacert.p12")
+ ca_enabled = ipautil.file_exists(os.path.join(config.dir, "cacert.p12"))
# Create the management framework config file
# Note: We must do this before bootstraping and finalizing ipalib.api
create_ipa_conf(fstore, config, ca_enabled)
@@ -673,7 +673,7 @@ def install_check(installer):
installutils.verify_fqdn(config.master_host_name, options.no_host_dns)
- cafile = config.dir + "/ca.crt"
+ cafile = os.path.join(config.dir, "ca.crt")
if not ipautil.file_exists(cafile):
raise RuntimeError("CA cert file is not available. Please run "
"ipa-replica-prepare to create a new replica file.")