From 625ffd23ee88b26287fadd0db33d1ceababbac21 Mon Sep 17 00:00:00 2001
From: Jamie McClelland <jm@mayfirst.org>
Date: Sat, 19 Mar 2011 23:55:22 -0400
Subject: We might get either a var or an array - we should be able to take
 either.

---
 templates/mysql.conf.erb | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

(limited to 'templates/mysql.conf.erb')

diff --git a/templates/mysql.conf.erb b/templates/mysql.conf.erb
index 2efa4b1..c70aba0 100644
--- a/templates/mysql.conf.erb
+++ b/templates/mysql.conf.erb
@@ -17,7 +17,9 @@ compress = <%= compress ? 'yes' : 'no' %>
 configfile = <%= real_configfile %>
 <% end %>
 
-<% if nodata %>
-nodata = <% nodata.each do |dbtable| -%><%= dbtable %> <% end -%>
-<% end %>
+<% if nodata.is_a? String -%>
+<%= 'nodata = ' + nodata %>
+<% elsif nodata.is_a? Array -%>
+<%= "nodata = " + nodata.map { |i| "#{i}" }.join(" ") %>
+<% end -%>
 
-- 
cgit v1.2.3