summaryrefslogtreecommitdiff
path: root/lib/chef/mixin
diff options
context:
space:
mode:
authorLamont Granquist <lamont@scriptkiddie.org>2018-05-30 11:58:05 -0700
committerLamont Granquist <lamont@scriptkiddie.org>2018-05-30 11:58:05 -0700
commitc80702c741232a5da0d410d4b8770137690430aa (patch)
tree68bd656095ee70fc53d436d3fc52f196f20508ef /lib/chef/mixin
parentfc98ec2b65e5a9a236f7374b831dcee6ab2100bb (diff)
downloadchef-c80702c741232a5da0d410d4b8770137690430aa.tar.gz
change "internal" to "default_env"
Signed-off-by: Lamont Granquist <lamont@scriptkiddie.org>
Diffstat (limited to 'lib/chef/mixin')
-rw-r--r--lib/chef/mixin/shell_out.rb10
1 files changed, 5 insertions, 5 deletions
diff --git a/lib/chef/mixin/shell_out.rb b/lib/chef/mixin/shell_out.rb
index cb6e02bd7e..236ef844b1 100644
--- a/lib/chef/mixin/shell_out.rb
+++ b/lib/chef/mixin/shell_out.rb
@@ -104,9 +104,9 @@ class Chef
# generally must support UTF-8 unicode.
def shell_out(*args, **options)
options = options.dup
- internal = options.delete(:internal)
- internal = true if internal.nil?
- if internal
+ default_env = options.delete(:default_env)
+ default_env = true if default_env.nil?
+ if default_env
env_key = options.key?(:env) ? :env : :environment
options[env_key] = {
"LC_ALL" => Chef::Config[:internal_locale],
@@ -126,11 +126,11 @@ class Chef
end
def shell_out_with_systems_locale(*args, **options) # FIXME: deprecate
- shell_out(*args, internal: false, **options)
+ shell_out(*args, default_env: false, **options)
end
def shell_out_with_systems_locale!(*args, **options) # FIXME: deprecate
- shell_out!(*args, internal: false, **options)
+ shell_out!(*args, default_env: false, **options)
end
# Helper for subclasses to convert an array of string args into a string. It