IntenseWebs/freeipa
3
0
Fork 0
mirror of https://salsa.debian.org/freeipa-team/freeipa.git synced 2025-02-25 18:55:28 -06:00
Code Issues Packages Projects Releases Wiki Activity

Use os.path.join instead of concatenation

Browse Source 
https://fedorahosted.org/freeipa/ticket/6392

Reviewed-By: Martin Basti <mbasti@redhat.com>
Reviewed-By: Jan Cholasta <jcholast@redhat.com>
This commit is contained in:
Stanislav Laznicka
2016-11-07 12:30:19 +01:00
committed by Jan Cholasta
parent 0b68899779
commit 928a4aa6f2
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
ipaserver/install/server/replicainstall.py
View File

@@ -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.")