diff options
| author | Lamont Granquist <lamont@scriptkiddie.org> | 2016-03-15 09:21:40 -0700 |
|---|---|---|
| committer | Lamont Granquist <lamont@scriptkiddie.org> | 2016-03-15 09:21:40 -0700 |
| commit | 09df2d39c20eef68980af5551da72db533fdc047 (patch) | |
| tree | a7648e378684c45c207898b9eaec0c7fede23490 /chef-config/lib/chef-config/config.rb | |
| parent | 3f07943715c31dd328dd104bba90d103b744323b (diff) | |
| parent | 2b45395f1720a0746a3dd57878d0959628af5835 (diff) | |
| download | chef-09df2d39c20eef68980af5551da72db533fdc047.tar.gz | |
Merge pull request #4706 from chef/lcg/chefstyle-andor
chefstyle Style/AndOr fixes
Diffstat (limited to 'chef-config/lib/chef-config/config.rb')
| -rw-r--r-- | chef-config/lib/chef-config/config.rb | 4 |
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 d2a4bddba0..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? and embedded_path = embedded_dir - cacert_path = File.join(embedded_path, "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 |