summaryrefslogtreecommitdiff
path: root/lib/chef
diff options
context:
space:
mode:
authorLamont Granquist <lamont@scriptkiddie.org>2018-06-18 10:06:47 -0700
committerLamont Granquist <lamont@scriptkiddie.org>2018-06-18 10:06:47 -0700
commit9582fcbe1aad72c8a7f776ae47ed3996cd5301e7 (patch)
tree6bedd84fdb4df9c977fe5f2c397ac799fdfbaa96 /lib/chef
parent292d226717dfffe959d3d48e9b9e7e533da69641 (diff)
downloadchef-9582fcbe1aad72c8a7f776ae47ed3996cd5301e7.tar.gz
fix infinite recursion and add more tests
Signed-off-by: Lamont Granquist <lamont@scriptkiddie.org>
Diffstat (limited to 'lib/chef')
-rw-r--r--lib/chef/mixin/shell_out.rb16
1 files changed, 8 insertions, 8 deletions
diff --git a/lib/chef/mixin/shell_out.rb b/lib/chef/mixin/shell_out.rb
index a17b428159..052ba5e94c 100644
--- a/lib/chef/mixin/shell_out.rb
+++ b/lib/chef/mixin/shell_out.rb
@@ -48,33 +48,33 @@ class Chef
def shell_out_compact(*args, **options) # FIXME: deprecate
if options.empty?
- shell_out_compact(*args)
+ shell_out(*args)
else
- shell_out_compact(*args, **options)
+ shell_out(*args, **options)
end
end
def shell_out_compact!(*args, **options) # FIXME: deprecate
if options.empty?
- shell_out_compact!(*args)
+ shell_out!(*args)
else
- shell_out_compact!(*args, **options)
+ shell_out!(*args, **options)
end
end
def shell_out_compact_timeout(*args, **options) # FIXME: deprecate
if options.empty?
- shell_out_compact(*args)
+ shell_out(*args)
else
- shell_out_compact(*args, **options)
+ shell_out(*args, **options)
end
end
def shell_out_compact_timeout!(*args, **options) # FIXME: deprecate
if options.empty?
- shell_out_compact!(*args)
+ shell_out!(*args)
else
- shell_out_compact!(*args, **options)
+ shell_out!(*args, **options)
end
end