diff options
Diffstat (limited to 'lib/chef')
| -rw-r--r-- | lib/chef/chef_fs/file_system/acl_entry.rb | 2 | ||||
| -rw-r--r-- | lib/chef/config.rb | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/lib/chef/chef_fs/file_system/acl_entry.rb b/lib/chef/chef_fs/file_system/acl_entry.rb index 1bd03a6095..b2545af5ae 100644 --- a/lib/chef/chef_fs/file_system/acl_entry.rb +++ b/lib/chef/chef_fs/file_system/acl_entry.rb @@ -32,7 +32,7 @@ class Chef end def delete(recurse) - raise Chef::ChefFS::FileSystem::OperationNotAllowedError.new(:delete, self, e), "ACLs cannot be deleted." + raise Chef::ChefFS::FileSystem::OperationNotAllowedError.new(:delete, self), "ACLs cannot be deleted." end def write(file_contents) diff --git a/lib/chef/config.rb b/lib/chef/config.rb index 08a377ca12..0cf13b79da 100644 --- a/lib/chef/config.rb +++ b/lib/chef/config.rb @@ -119,7 +119,7 @@ class Chef # === Parameters # url<String>:: String to be set for all of the chef-server-api URL's # - configurable(:chef_server_url).writes_value { |url| url.strip } + configurable(:chef_server_url).writes_value { |url| url.to_s.strip } # When you are using ActiveSupport, they monkey-patch 'daemonize' into Kernel. # So while this is basically identical to what method_missing would do, we pull |