Please review pull request #495: Clean up deprecation warning opened by (cprice-puppet)
Description:
Puppet::Util.execute deprecation warning message had a typo; also
fixed a few places that were calling the deprecated code path.
- Opened: Tue Feb 14 17:29:34 UTC 2012
- Based on: puppetlabs:master (4f0559bd459c4fa72a8ce82163c4ac8536d8cc51)
- Requested merge: cprice-puppet:cleanup/master/deprecated-util-execution-message (25a6d5c503c409e6ced21fb24e666df34ee718cc)
Diff follows:
diff --git a/lib/puppet/provider.rb b/lib/puppet/provider.rb
index e1b1b8f..d902206 100644
--- a/lib/puppet/provider.rb
+++ b/lib/puppet/provider.rb
@@ -1,7 +1,7 @@
# The container class for implementations.
class Puppet::Provider
- include Puppet::Util
include Puppet::Util::Execution
+ include Puppet::Util
include Puppet::Util::Errors
include Puppet::Util::Warnings
extend Puppet::Util::Warnings
diff --git a/lib/puppet/util.rb b/lib/puppet/util.rb
index 737a928..e7570f8 100644
--- a/lib/puppet/util.rb
+++ b/lib/puppet/util.rb
@@ -420,7 +420,7 @@ def execfail(command, exception)
module_function :execfail
def execute(command, arguments = {})
- Puppet.deprecation_warning("Puppet::Util::Execution.execute is deprecated; please use Puppet::Util::Execution.execute")
+ Puppet.deprecation_warning("Puppet::Util.execute is deprecated; please use Puppet::Util::Execution.execute")
Puppet::Util::Execution.execute(command, arguments)
end
module_function :execute
diff --git a/lib/puppet/util/diff.rb b/lib/puppet/util/diff.rb
index b8bbbe6..c502553 100644
--- a/lib/puppet/util/diff.rb
+++ b/lib/puppet/util/diff.rb
@@ -1,6 +1,6 @@
# Provide a diff between two strings.
module Puppet::Util::Diff
- include Puppet::Util
+ include Puppet::Util::Execution
require 'tempfile'
def diff(old, new)
-- You received this message because you are subscribed to the Google Groups "Puppet Developers" group.
To post to this group, send email to [email protected].
To unsubscribe from this group, send email to [email protected].
For more options, visit this group at http://groups.google.com/group/puppet-dev?hl=en.
