summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLamont Granquist <lamont@scriptkiddie.org>2016-03-14 17:37:17 -0700
committerLamont Granquist <lamont@scriptkiddie.org>2016-03-14 17:37:17 -0700
commit2b45395f1720a0746a3dd57878d0959628af5835 (patch)
tree1201ebdee9d26ffd983ed28012b99ae83ff54c25
parent4f2a756684ff6c828f5bc3ef6c1885871eefa33c (diff)
downloadchef-lcg/chefstyle-andor.tar.gz
fix windows specslcg/chefstyle-andor
-rw-r--r--chef-config/lib/chef-config/config.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/chef-config/lib/chef-config/config.rb b/chef-config/lib/chef-config/config.rb
index a4a5d9a77f..d7a8a1b997 100644
--- a/chef-config/lib/chef-config/config.rb
+++ b/chef-config/lib/chef-config/config.rb
@@ -476,8 +476,8 @@ module ChefConfig
# Path to the default CA bundle files.
default :ssl_ca_path, nil
default(:ssl_ca_file) do
- if ChefConfig.windows? &&
- cacert_path = File.join(embedded_dir, "ssl/certs/cacert.pem")
+ if ChefConfig.windows? && embedded_dir
+ cacert_path = File.join(embedded_dir, "ssl/certs/cacert.pem")
cacert_path if File.exist?(cacert_path)
else
nil