diff options
Diffstat (limited to 'lib/chef/provider')
| -rw-r--r-- | lib/chef/provider/launchd.rb | 2 | ||||
| -rw-r--r-- | lib/chef/provider/package/zypper.rb | 2 | ||||
| -rw-r--r-- | lib/chef/provider/route.rb | 6 | ||||
| -rw-r--r-- | lib/chef/provider/service/macosx.rb | 2 | ||||
| -rw-r--r-- | lib/chef/provider/template_finder.rb | 12 |
5 files changed, 6 insertions, 18 deletions
diff --git a/lib/chef/provider/launchd.rb b/lib/chef/provider/launchd.rb index 37c73924f8..1045d4294f 100644 --- a/lib/chef/provider/launchd.rb +++ b/lib/chef/provider/launchd.rb @@ -209,7 +209,7 @@ class Chef # @api private def path - @path ||= new_resource.path ? new_resource.path : gen_path_from_type + @path ||= new_resource.path || gen_path_from_type end end end diff --git a/lib/chef/provider/package/zypper.rb b/lib/chef/provider/package/zypper.rb index 1096dcd044..da6bf0efbf 100644 --- a/lib/chef/provider/package/zypper.rb +++ b/lib/chef/provider/package/zypper.rb @@ -158,7 +158,7 @@ class Chef end def global_options - new_resource.global_options if new_resource.global_options + new_resource.global_options end end end diff --git a/lib/chef/provider/route.rb b/lib/chef/provider/route.rb index 3eac41aef0..8a304a7e45 100644 --- a/lib/chef/provider/route.rb +++ b/lib/chef/provider/route.rb @@ -169,11 +169,7 @@ class Chef next unless resource.is_a? Chef::Resource::Route # default to eth0 - dev = if resource.device - resource.device - else - "eth0" - end + dev = resource.device || "eth0" conf[dev] = "" if conf[dev].nil? case @action diff --git a/lib/chef/provider/service/macosx.rb b/lib/chef/provider/service/macosx.rb index ae04c7bfdd..2152789a6e 100644 --- a/lib/chef/provider/service/macosx.rb +++ b/lib/chef/provider/service/macosx.rb @@ -47,7 +47,7 @@ class Chef @current_resource = Chef::Resource::MacosxService.new(@new_resource.name) @current_resource.service_name(@new_resource.service_name) @plist_size = 0 - @plist = @new_resource.plist ? @new_resource.plist : find_service_plist + @plist = @new_resource.plist || find_service_plist @service_label = find_service_label # LaunchAgents should be loaded as the console user. @console_user = @plist ? @plist.include?("LaunchAgents") : false diff --git a/lib/chef/provider/template_finder.rb b/lib/chef/provider/template_finder.rb index fdc5eaeda9..fa120a1624 100644 --- a/lib/chef/provider/template_finder.rb +++ b/lib/chef/provider/template_finder.rb @@ -43,19 +43,11 @@ class Chef protected def template_source_name(name, options) - if options[:source] - options[:source] - else - name - end + options[:source] || name end def find_cookbook_name(options) - if options[:cookbook] - options[:cookbook] - else - @cookbook_name - end + options[:cookbook] || @cookbook_name end end end |