diff options
Diffstat (limited to 'lib/puppet')
| -rw-r--r-- | lib/puppet/network/client/master.rb | 2 | ||||
| -rw-r--r-- | lib/puppet/type.rb | 7 |
2 files changed, 8 insertions, 1 deletions
diff --git a/lib/puppet/network/client/master.rb b/lib/puppet/network/client/master.rb index 7feebd2e6..52a569b36 100644 --- a/lib/puppet/network/client/master.rb +++ b/lib/puppet/network/client/master.rb @@ -140,7 +140,7 @@ class Puppet::Network::Client::Master < Puppet::Network::Client return false end if facts_changed?(facts) - Puppet.info "Facts have changed; recompiling" + Puppet.info "Facts have changed; recompiling" unless local? return false end diff --git a/lib/puppet/type.rb b/lib/puppet/type.rb index 0144b517c..b745c6322 100644 --- a/lib/puppet/type.rb +++ b/lib/puppet/type.rb @@ -261,6 +261,13 @@ class Type < Puppet::Element end end + if hash.include?(:provider) + self[:provider] = hash[:provider] + hash.delete(:provider) + else + setdefaults(:provider) + end + # This is all of our attributes except the namevar. attrs.each { |attr| if hash.include?(attr) |