X-Git-Url: https://git.openstreetmap.org/chef.git/blobdiff_plain/57997055a817d2104f605a56141ae26515aabbd2..ea0715b4be41a1d1600bba7a1f5d0b988708579f:/cookbooks/mysql/libraries/mysql.rb diff --git a/cookbooks/mysql/libraries/mysql.rb b/cookbooks/mysql/libraries/mysql.rb index 2b2bca67d..769df807e 100644 --- a/cookbooks/mysql/libraries/mysql.rb +++ b/cookbooks/mysql/libraries/mysql.rb @@ -104,12 +104,12 @@ class Chef end query("SELECT * FROM db").each do |record| - if database = @databases[record[:db]] - user = "'#{record[:user]}'@'#{record[:host]}'" + next unless database = @databases[record[:db]] - database[:permissions][user] = DATABASE_PRIVILEGES.each_with_object([]) do |privilege, privileges| - privileges << privilege if record["#{privilege}_priv".to_sym] == "Y" - end + user = "'#{record[:user]}'@'#{record[:host]}'" + + database[:permissions][user] = DATABASE_PRIVILEGES.each_with_object([]) do |privilege, privileges| + privileges << privilege if record["#{privilege}_priv".to_sym] == "Y" end end