summaryrefslogtreecommitdiffstats
path: root/lib/puppet
diff options
context:
space:
mode:
authorluke <luke@980ebf18-57e1-0310-9a29-db15c13687c0>2007-05-18 03:34:37 +0000
committerluke <luke@980ebf18-57e1-0310-9a29-db15c13687c0>2007-05-18 03:34:37 +0000
commitdf6f41a01d00f4357245a6833129328df9165242 (patch)
treedced29ec951391c44d05ca5027620a7af71a45d8 /lib/puppet
parentef1a4afc187026db1840073eb4bb4d587e4aa86f (diff)
downloadpuppet-df6f41a01d00f4357245a6833129328df9165242.tar.gz
puppet-df6f41a01d00f4357245a6833129328df9165242.tar.xz
puppet-df6f41a01d00f4357245a6833129328df9165242.zip
Changing the notify type so that it always uses the loglevel for logging
git-svn-id: https://reductivelabs.com/svn/puppet/trunk@2525 980ebf18-57e1-0310-9a29-db15c13687c0
Diffstat (limited to 'lib/puppet')
-rw-r--r--lib/puppet/type/notify.rb5
-rwxr-xr-xlib/puppet/type/user.rb2
2 files changed, 3 insertions, 4 deletions
diff --git a/lib/puppet/type/notify.rb b/lib/puppet/type/notify.rb
index 2d8e2e4fc..743755108 100644
--- a/lib/puppet/type/notify.rb
+++ b/lib/puppet/type/notify.rb
@@ -11,7 +11,7 @@ module Puppet
def sync
case @resource["withpath"]
when :true:
- log(self.should)
+ send(@resource[:loglevel], self.should)
else
Puppet.send(@resource[:loglevel], self.should)
end
@@ -30,8 +30,7 @@ module Puppet
end
newparam(:withpath) do
- desc "Whether to not to show the full object path. Sends the
- message at the current loglevel."
+ desc "Whether to not to show the full object path."
defaultto :false
newvalues(:true, :false)
diff --git a/lib/puppet/type/user.rb b/lib/puppet/type/user.rb
index 417bf7cf5..87a57cddd 100755
--- a/lib/puppet/type/user.rb
+++ b/lib/puppet/type/user.rb
@@ -22,7 +22,7 @@ module Puppet
"The provider can modify user passwords, by accepting a password
hash."
- newproperty(:ensure) do
+ newproperty(:ensure, :parent => Puppet::Property::Ensure) do
newvalue(:present, :event => :user_created) do
provider.create
end