diff options
| author | Jeremy Miller <jeremymv2@users.noreply.github.com> | 2017-07-18 07:17:42 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-07-18 07:17:42 -0400 |
| commit | ebe140ab6c83ecd2cbf3bd34eb087ca341e9f6a0 (patch) | |
| tree | b695ab9fd318eb0b0cbbc96e358889f72499f700 | |
| parent | c8abc7988880adfd91f024ce02c80e56d569db2a (diff) | |
| parent | 6b34164ae2783ae698802434e28c466c1a5b8754 (diff) | |
| download | chef-ebe140ab6c83ecd2cbf3bd34eb087ca341e9f6a0.tar.gz | |
Merge pull request #6278 from jeremymv2/jeremymv2/knife_status_fix
avoid mutation attempt of node['platform']
| -rw-r--r-- | lib/chef/knife/core/status_presenter.rb | 2 | ||||
| -rw-r--r-- | spec/unit/knife/status_spec.rb | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/lib/chef/knife/core/status_presenter.rb b/lib/chef/knife/core/status_presenter.rb index df6c2fe942..f55f9abcbb 100644 --- a/lib/chef/knife/core/status_presenter.rb +++ b/lib/chef/knife/core/status_presenter.rb @@ -123,7 +123,7 @@ class Chef line_parts << run_list if run_list if node["platform"] - platform = node["platform"] + platform = node["platform"].dup if node["platform_version"] platform << " #{node['platform_version']}" end diff --git a/spec/unit/knife/status_spec.rb b/spec/unit/knife/status_spec.rb index c87ea3ad17..929a0f742b 100644 --- a/spec/unit/knife/status_spec.rb +++ b/spec/unit/knife/status_spec.rb @@ -23,6 +23,8 @@ describe Chef::Knife::Status do node = Chef::Node.new.tap do |n| n.automatic_attrs["fqdn"] = "foobar" n.automatic_attrs["ohai_time"] = 1343845969 + n.automatic_attrs["platform"] = "mac_os_x" + n.automatic_attrs["platform_version"] = "10.12.5" end allow(Time).to receive(:now).and_return(Time.at(1428573420)) @query = double("Chef::Search::Query") |