diff options
| author | Tim Smith <tsmith@chef.io> | 2020-10-16 11:42:44 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-10-16 11:42:44 -0700 |
| commit | f4173ac3ba4942ea3d551e6db70284209d0b1a14 (patch) | |
| tree | 1126dbb3f2d99dadec4f2baa5ada27a385846456 | |
| parent | bd07408ea400709827fb99215b24ea96eec37ca9 (diff) | |
| parent | 64982a13916d1f31edcd7dfd17c14040e44c8671 (diff) | |
| download | chef-f4173ac3ba4942ea3d551e6db70284209d0b1a14.tar.gz | |
Merge pull request #10517 from chef/avoid_merge
Avoid a slow hash merge
| -rw-r--r-- | lib/chef/provider/package/freebsd/base.rb | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/lib/chef/provider/package/freebsd/base.rb b/lib/chef/provider/package/freebsd/base.rb index 2805200516..46a01e754c 100644 --- a/lib/chef/provider/package/freebsd/base.rb +++ b/lib/chef/provider/package/freebsd/base.rb @@ -58,9 +58,10 @@ class Chef def makefile_variable_value(variable, dir = nil) options = dir ? { cwd: dir } : {} - options.merge!(env: nil, returns: [0, 1]) + options[:env] = nil + options[:returns] = [0, 1] make_v = shell_out!("make", "-V", variable, **options) - make_v.exitstatus == 0 ? make_v.stdout.strip.split($OUTPUT_RECORD_SEPARATOR).first : nil # $\ is the line separator, i.e. newline. + make_v.exitstatus == 0 ? make_v.stdout.strip.split($OUTPUT_RECORD_SEPARATOR).first : nil end end |