diff options
author | Nick Lewis <nick@puppetlabs.com> | 2010-06-29 15:49:31 -0700 |
---|---|---|
committer | Markus Roberts <Markus@reality.com> | 2010-07-01 13:48:01 -0700 |
commit | 3cd48d836c9ffe4e59bca78f1033020cecf63354 (patch) | |
tree | 226f0dc6f00ac5160bcb232dae743ace05eec1fc | |
parent | e848d4104350543241fa1a84aa3eaaf3a27d2616 (diff) | |
download | puppet-3cd48d836c9ffe4e59bca78f1033020cecf63354.tar.gz puppet-3cd48d836c9ffe4e59bca78f1033020cecf63354.tar.xz puppet-3cd48d836c9ffe4e59bca78f1033020cecf63354.zip |
[#4089] Replace internal usage of :check with :audit
Per Luke's replacement of :check with :audit, and deprecation of :check,
I've replaced all of our internal uses of :check with :audit. Importantly,
this silence the deprecation warnings during regular usage from eg. ralsh.
-rw-r--r-- | lib/puppet/indirector/resource/ral.rb | 2 | ||||
-rwxr-xr-x | lib/puppet/network/handler/fileserver.rb | 4 | ||||
-rw-r--r-- | lib/puppet/type.rb | 2 | ||||
-rw-r--r-- | lib/puppet/type/file.rb | 4 | ||||
-rwxr-xr-x | lib/puppet/type/file/source.rb | 2 | ||||
-rw-r--r-- | lib/puppet/type/resources.rb | 2 | ||||
-rw-r--r-- | lib/puppet/type/yumrepo.rb | 4 | ||||
-rw-r--r-- | lib/puppet/util/settings.rb | 2 |
8 files changed, 11 insertions, 11 deletions
diff --git a/lib/puppet/indirector/resource/ral.rb b/lib/puppet/indirector/resource/ral.rb index 56fc62844..d66c85622 100644 --- a/lib/puppet/indirector/resource/ral.rb +++ b/lib/puppet/indirector/resource/ral.rb @@ -2,7 +2,7 @@ class Puppet::Resource::Ral < Puppet::Indirector::Code def find( request ) # find by name res = type(request).instances.find { |o| o.name == resource_name(request) } - res ||= type(request).new(:name => resource_name(request), :check => type(request).properties.collect { |s| s.name }) + res ||= type(request).new(:name => resource_name(request), :audit => type(request).properties.collect { |s| s.name }) return res.to_resource end diff --git a/lib/puppet/network/handler/fileserver.rb b/lib/puppet/network/handler/fileserver.rb index bed232fc3..84af5ac55 100755 --- a/lib/puppet/network/handler/fileserver.rb +++ b/lib/puppet/network/handler/fileserver.rb @@ -513,11 +513,11 @@ class Puppet::Network::Handler # important one. It'd be nice if we didn't just set # the check params every time, but I'm not sure it's worth # the effort. - obj[:check] = CHECKPARAMS + obj[:audit] = CHECKPARAMS else obj = Puppet::Type.type(:file).new( :name => file_path(path, client), - :check => CHECKPARAMS + :audit => CHECKPARAMS ) @files[file_path(path, client)] = obj end diff --git a/lib/puppet/type.rb b/lib/puppet/type.rb index 4b626df0f..6e553d463 100644 --- a/lib/puppet/type.rb +++ b/lib/puppet/type.rb @@ -923,7 +923,7 @@ class Type end provider_instances[instance.name] = instance - new(:name => instance.name, :provider => instance, :check => :all) + new(:name => instance.name, :provider => instance, :audit => :all) end end.flatten.compact end diff --git a/lib/puppet/type/file.rb b/lib/puppet/type/file.rb index ec7a3faaf..37820b30f 100644 --- a/lib/puppet/type/file.rb +++ b/lib/puppet/type/file.rb @@ -311,11 +311,11 @@ Puppet::Type.newtype(:file) do }.each do |name| path = File.join(base, name) if obj = self[path] - obj[:check] = :all + obj[:audit] = :all files << obj else files << self.new( - :name => path, :check => :all + :name => path, :audit => :all ) end end diff --git a/lib/puppet/type/file/source.rb b/lib/puppet/type/file/source.rb index aaf91695c..77fb4f38c 100755 --- a/lib/puppet/type/file/source.rb +++ b/lib/puppet/type/file/source.rb @@ -162,7 +162,7 @@ module Puppet checks = (pinparams + [:ensure]) checks.delete(:checksum) - resource[:check] = checks + resource[:audit] = checks resource[:checksum] = :md5 unless resource.property(:checksum) end diff --git a/lib/puppet/type/resources.rb b/lib/puppet/type/resources.rb index f5cf5a41c..136b691c3 100644 --- a/lib/puppet/type/resources.rb +++ b/lib/puppet/type/resources.rb @@ -130,7 +130,7 @@ Puppet::Type.newtype(:resources) do return true unless self[:name] == "user" return true unless self[:unless_system_user] - resource[:check] = :uid + resource[:audit] = :uid current_values = resource.retrieve if system_users().include?(resource[:name]) diff --git a/lib/puppet/type/yumrepo.rb b/lib/puppet/type/yumrepo.rb index 018fd053c..36e95ebf1 100644 --- a/lib/puppet/type/yumrepo.rb +++ b/lib/puppet/type/yumrepo.rb @@ -86,7 +86,7 @@ module Puppet clear inifile.each_section do |s| next if s.name == "main" - obj = create(:name => s.name, :check => check) + obj = create(:name => s.name, :audit => check) current_values = obj.retrieve obj.eachproperty do |property| if current_values[property].nil? @@ -95,7 +95,7 @@ module Puppet property.should = current_values[property] end end - obj.delete(:check) + obj.delete(:audit) l << obj end l diff --git a/lib/puppet/util/settings.rb b/lib/puppet/util/settings.rb index 2dedc31da..780461d4b 100644 --- a/lib/puppet/util/settings.rb +++ b/lib/puppet/util/settings.rb @@ -469,7 +469,7 @@ class Puppet::Util::Settings return @service_user_available = false unless user_name = self[:user] - user = Puppet::Type.type(:user).new :name => self[:user], :check => :ensure + user = Puppet::Type.type(:user).new :name => self[:user], :audit => :ensure return @service_user_available = user.exists? end |