← Back to branch summary

~ubuntu-branches/ubuntu/karmic/chef/karmic

« back to all changes in this revision

Viewing changes to chef/lib/chef/runner.rb

  • Committer: Bazaar Package Importer
  • Author(s): Joshua Timberman, Joshua Timberman, Fabrice Coutadeur
  • Date: 2009-09-30 19:19:37 UTC
  • mfrom: (1.1.1 upstream)
  • Revision ID: james.westby@ubuntu.com-20090930191937-1clge7ckxfjm0wx3
Tags: 0.7.10-0ubuntu1
[ Joshua Timberman ]
* New upstream release
* Upstream patch for couchdb 0.10.0 (CHEF-515, quilt patch removed)
* Fix client logging to file (CHEF-287)
* Fix config log_location settings (CHEF-500)
* Requires libmixlib-config-ruby (>= 1.0.12)

[ Fabrice Coutadeur ]
* debian/watch: updated to avoid getting non numerical versions

Show diffs side-by-side

added added

removed removed

Lines of Context:
chef/lib/chef/runner.rb
47
47
    
48
48
    def build_provider(resource)
49
49
      provider_klass = resource.provider
50
 
      if provider_klass == nil
51
 
        provider_klass = Chef::Platform.find_provider_for_node(@node, resource)      
52
 
      end
 
50
      provider_klass ||= Chef::Platform.find_provider_for_node(@node, resource)
53
51
      Chef::Log.debug("#{resource} using #{provider_klass.to_s}")
54
52
      provider = provider_klass.new(@node, resource)
55
53
      provider.load_current_resource