diff options
author | Tim Smith <tsmith84@gmail.com> | 2016-02-10 22:28:21 -0800 |
---|---|---|
committer | Tim Smith <tsmith84@gmail.com> | 2016-02-15 18:40:30 -0800 |
commit | a4e9ed0f0445e9686f6ab004f0d5950e56fe7371 (patch) | |
tree | abbb527cfbb0d1a816177e8f27609e9dbe9e272f | |
parent | ac9f5a2ae4ada9f2e6e821418ed3a9039bda9a91 (diff) | |
download | ohai-a4e9ed0f0445e9686f6ab004f0d5950e56fe7371.tar.gz |
Deprecate run_command and popen4 in the command mixin
These aren't used anywhere and seem to be pre-mixlib shellout. They should go away, but for now someone might be using them in a plugin so we'll just throw a warn and then remove them in Ohai 9.
-rw-r--r-- | lib/ohai/mixin/command.rb | 27 |
1 files changed, 15 insertions, 12 deletions
diff --git a/lib/ohai/mixin/command.rb b/lib/ohai/mixin/command.rb index ded7c5f4..b76fa3ef 100644 --- a/lib/ohai/mixin/command.rb +++ b/lib/ohai/mixin/command.rb @@ -37,6 +37,7 @@ module Ohai module_function :shell_out def run_command(args = {}) + Ohai::Log.warn('Ohai::Mixin::Command run_command is deprecated and will be removed in Ohai 9.0.0') if args.has_key?(:creates) if File.exists?(args[:creates]) Ohai::Log.debug("Skipping #{args[:command]} - creates #{args[:creates]} exists.") @@ -124,17 +125,19 @@ module Ohai # # Thanks Ara! def popen4(cmd, args = {}, &b) - ## Disable garbage collection to work around possible bug in MRI - # Ruby 1.8 suffers from intermittent segfaults believed to be due to GC while IO.select - # See OHAI-330 / CHEF-2916 / CHEF-1305 + Ohai::Log.warn('Ohai::Mixin::Command popen4 is deprecated and will be removed in Ohai 9.0.0') + + # Disable garbage collection to work around possible bug in MRI + # Ruby 1.8 suffers from intermittent segfaults believed to be due to GC while IO.select + # See OHAI-330 / CHEF-2916 / CHEF-1305 GC.disable - # Waitlast - this is magic. - # - # Do we wait for the child process to die before we yield - # to the block, or after? That is the magic of waitlast. - # - # By default, we are waiting before we yield the block. + # Waitlast - this is magic. + # + # Do we wait for the child process to die before we yield + # to the block, or after? That is the magic of waitlast. + # + # By default, we are waiting before we yield the block. args[:waitlast] ||= false args[:user] ||= nil @@ -147,9 +150,9 @@ module Ohai end args[:environment] ||= {} - # Default on C locale so parsing commands output can be done - # independently of the node's default locale. - # "LC_ALL" could be set to nil, in which case we also must ignore it. + # Default on C locale so parsing commands output can be done + # independently of the node's default locale. + # "LC_ALL" could be set to nil, in which case we also must ignore it. unless args[:environment].has_key?("LC_ALL") args[:environment]["LC_ALL"] = "C" end |