Fixed #1003 -- Applying DavidS's patch to fix searching for

tags in sql.
brenton · Feb 13, 2008 · fe02591 · fe02591
1 parent 9b1bfc1
commit fe02591
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/CHANGELOG b/CHANGELOG
@@ -1,3 +1,6 @@
+    Fixed #1003 -- Applying DavidS's patch to fix searching for
+    tags in sql.
+
     Fixed #992 -- Puppet is now compatible with gems 1.0.1.
 
     Fixed #968 again, this time with tests -- parseonly works,

diff --git a/lib/puppet/parser/collector.rb b/lib/puppet/parser/collector.rb
@@ -51,7 +51,7 @@ def build_active_record_query
         search = "(exported=? AND restype=?)"
         values = [true, @type]
 
-        search += " AND (?)" and values << @equery if @equery
+        search += " AND (%s)" % @equery if @equery
 
         # We're going to collect objects from rails, but we don't want any
         # objects from this host.