summaryrefslogtreecommitdiff
path: root/lib/chef/mixin
diff options
context:
space:
mode:
authorLamont Granquist <lamont@scriptkiddie.org>2019-05-24 14:43:24 -0700
committerLamont Granquist <lamont@scriptkiddie.org>2019-05-24 14:44:24 -0700
commitb2e58d3594bb9a4dd8e1dbcf7212627ad20fd0cd (patch)
treec13b965d73d9a6f909046aa18fb35060ba1582d7 /lib/chef/mixin
parentf8f3b2499f45d7392b6500f781f8a70c26d3b113 (diff)
downloadchef-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/chef/mixin')
-rw-r--r--lib/chef/mixin/shell_out.rb2
1 files changed, 1 insertions, 1 deletions
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