diff options
author | Lamont Granquist <lamont@scriptkiddie.org> | 2016-03-14 10:34:33 -0700 |
---|---|---|
committer | Lamont Granquist <lamont@scriptkiddie.org> | 2016-03-14 10:34:33 -0700 |
commit | 6705acbd7f301d1b04388043a3dfa0308655f120 (patch) | |
tree | 1e8a43b35ef1684a4b90578f1a6374758aa7e3c7 /lib/chef/http | |
parent | 365064280c93d519fdacbf032c0c21057e5549c9 (diff) | |
download | chef-6705acbd7f301d1b04388043a3dfa0308655f120.tar.gz |
chefstyle Style/AndOr fixes
this is part of our informal style guide, lets make it formal since
clearly its not getting followed very well.
Diffstat (limited to 'lib/chef/http')
-rw-r--r-- | lib/chef/http/socketless_chef_zero_client.rb | 2 | ||||
-rw-r--r-- | lib/chef/http/ssl_policies.rb | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/lib/chef/http/socketless_chef_zero_client.rb b/lib/chef/http/socketless_chef_zero_client.rb index 8c1578b976..9d5be78a57 100644 --- a/lib/chef/http/socketless_chef_zero_client.rb +++ b/lib/chef/http/socketless_chef_zero_client.rb @@ -177,7 +177,7 @@ class Chef def to_net_http(code, headers, chunked_body) body = chunked_body.join("") - msg = STATUS_MESSAGE[code] or raise "Cannot determine HTTP status message for code #{code}" + (msg = STATUS_MESSAGE[code]) || raise("Cannot determine HTTP status message for code #{code}") response = Net::HTTPResponse.send(:response_class, code.to_s).new("1.0", code.to_s, msg) response.instance_variable_set(:@body, body) headers.each do |name, value| diff --git a/lib/chef/http/ssl_policies.rb b/lib/chef/http/ssl_policies.rb index 74c8093f98..a3692b81b6 100644 --- a/lib/chef/http/ssl_policies.rb +++ b/lib/chef/http/ssl_policies.rb @@ -118,7 +118,7 @@ class Chef class APISSLPolicy < DefaultSSLPolicy def set_verify_mode - if config[:ssl_verify_mode] == :verify_peer or config[:verify_api_cert] + if config[:ssl_verify_mode] == :verify_peer || config[:verify_api_cert] http_client.verify_mode = OpenSSL::SSL::VERIFY_PEER elsif config[:ssl_verify_mode] == :verify_none http_client.verify_mode = OpenSSL::SSL::VERIFY_NONE |