From 948eba0d97ac72d155b33ba8d5ce295cac39db08 Mon Sep 17 00:00:00 2001 From: Tom Hughes Date: Sat, 4 Feb 2017 11:10:48 +0000 Subject: [PATCH] Inherit manage_home attribute for accounts properly Because it's a boolean we can't just chain or operators as an explict false will trigger fallback, so use Hash#fetch with default values to do the fallback instead. --- cookbooks/accounts/recipes/default.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cookbooks/accounts/recipes/default.rb b/cookbooks/accounts/recipes/default.rb index d6c7806fd..c6424b3ed 100644 --- a/cookbooks/accounts/recipes/default.rb +++ b/cookbooks/accounts/recipes/default.rb @@ -31,7 +31,7 @@ search(:accounts, "*:*").each do |account| if details[:status] group_members = details[:members] || account["members"] || [] user_home = details[:home] || account["home"] || "#{node[:accounts][:home]}/#{name}" - manage_user_home = details[:manage_home] || account["manage_home"] || node[:accounts][:manage_home] + manage_user_home = details.fetch(:manage_home, account.fetch("manage_home", node[:accounts][:manage_home])) group_members = group_members.collect(&:to_s).sort -- 2.43.2