diff options
| author | Lamont Granquist <lamont@scriptkiddie.org> | 2019-05-24 14:43:24 -0700 |
|---|---|---|
| committer | Lamont Granquist <lamont@scriptkiddie.org> | 2019-05-24 14:44:24 -0700 |
| commit | b2e58d3594bb9a4dd8e1dbcf7212627ad20fd0cd (patch) | |
| tree | c13b965d73d9a6f909046aa18fb35060ba1582d7 /lib | |
| parent | f8f3b2499f45d7392b6500f781f8a70c26d3b113 (diff) | |
| download | chef-b2e58d3594bb9a4dd8e1dbcf7212627ad20fd0cd.tar.gz | |
fix shellout require idempotency and bump gems
something is declaring an empty class somewhere and trolling me hard
but ruby makes that near impossible to figure out, so be slightly more
specific by looking for a mixlib-shellout constant
also bumps the gems
Signed-off-by: Lamont Granquist <lamont@scriptkiddie.org>
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/chef/knife/ssh.rb | 1 | ||||
| -rw-r--r-- | lib/chef/mixin/shell_out.rb | 2 | ||||
| -rw-r--r-- | lib/chef/util/powershell/cmdlet.rb | 2 |
3 files changed, 2 insertions, 3 deletions
diff --git a/lib/chef/knife/ssh.rb b/lib/chef/knife/ssh.rb index a3cda96fb5..e979002c75 100644 --- a/lib/chef/knife/ssh.rb +++ b/lib/chef/knife/ssh.rb @@ -30,7 +30,6 @@ class Chef require_relative "../exceptions" require_relative "../search/query" require_relative "../util/path_helper" - require "mixlib/shellout" unless defined?(Mixlib::ShellOut) end include Chef::Mixin::ShellOut diff --git a/lib/chef/mixin/shell_out.rb b/lib/chef/mixin/shell_out.rb index d888dc3457..3a79c15b5d 100644 --- a/lib/chef/mixin/shell_out.rb +++ b/lib/chef/mixin/shell_out.rb @@ -15,7 +15,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -require "mixlib/shellout" unless defined?(Mixlib::ShellOut) +require "mixlib/shellout" unless defined?(Mixlib::ShellOut::DEFAULT_READ_TIMEOUT) require_relative "path_sanity" class Chef diff --git a/lib/chef/util/powershell/cmdlet.rb b/lib/chef/util/powershell/cmdlet.rb index ab0516b20e..72657a6d55 100644 --- a/lib/chef/util/powershell/cmdlet.rb +++ b/lib/chef/util/powershell/cmdlet.rb @@ -16,7 +16,7 @@ # limitations under the License. # -require "mixlib/shellout" unless defined?(Mixlib::ShellOut) +require "mixlib/shellout" unless defined?(Mixlib::ShellOut::DEFAULT_READ_TIMEOUT) require_relative "../../mixin/windows_architecture_helper" require_relative "cmdlet_result" |