From 7503df7c135fd20beb9c64300f92d7dd73f3936a Mon Sep 17 00:00:00 2001 From: Peter Walz Date: Tue, 18 Oct 2016 13:56:12 -0500 Subject: Remove leading and trailing quotes when reading certain environment variables Fixes a side effect of #5127 where if a `cron` resource sets MAILTO, PATH, SHELL, or HOME, it gets updated with every chef-client run. Signed-off-by: Peter Walz --- lib/chef/provider/cron.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/chef/provider/cron.rb b/lib/chef/provider/cron.rb index 7baaeec0c5..4a9a73cd27 100644 --- a/lib/chef/provider/cron.rb +++ b/lib/chef/provider/cron.rb @@ -199,7 +199,7 @@ class Chef def set_environment_var(attr_name, attr_value) if %w{MAILTO PATH SHELL HOME}.include?(attr_name) - @current_resource.send(attr_name.downcase.to_sym, attr_value) + @current_resource.send(attr_name.downcase.to_sym, attr_value.gsub(/^"|"$/, '')) else @current_resource.environment(@current_resource.environment.merge(attr_name => attr_value)) end -- cgit v1.2.1 From 341bcd93a9416c99bd67db4258a37fb4f362bc92 Mon Sep 17 00:00:00 2001 From: Peter Walz Date: Tue, 18 Oct 2016 15:14:18 -0500 Subject: Style fix - change single quotes to double Signed-off-by: Peter Walz --- lib/chef/provider/cron.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/chef/provider/cron.rb b/lib/chef/provider/cron.rb index 4a9a73cd27..35e5bb874c 100644 --- a/lib/chef/provider/cron.rb +++ b/lib/chef/provider/cron.rb @@ -199,7 +199,7 @@ class Chef def set_environment_var(attr_name, attr_value) if %w{MAILTO PATH SHELL HOME}.include?(attr_name) - @current_resource.send(attr_name.downcase.to_sym, attr_value.gsub(/^"|"$/, '')) + @current_resource.send(attr_name.downcase.to_sym, attr_value.gsub(/^"|"$/, "")) else @current_resource.environment(@current_resource.environment.merge(attr_name => attr_value)) end -- cgit v1.2.1