diff options
| author | James Turnbull <james@lovedthanlost.net> | 2008-02-14 09:37:36 +1100 |
|---|---|---|
| committer | James Turnbull <james@lovedthanlost.net> | 2008-02-14 09:37:36 +1100 |
| commit | c0d72265a37bffbb0becee0c46511db2a1108899 (patch) | |
| tree | e2ed24a61e7becea259759e38e256767e2f1941d /lib/puppet/parser | |
| parent | 0c457ee6373d436729a5d3492ca25a02c568103d (diff) | |
| parent | fe02591eaad7c8648699b53c9361ffab851e2022 (diff) | |
| download | puppet-c0d72265a37bffbb0becee0c46511db2a1108899.tar.gz puppet-c0d72265a37bffbb0becee0c46511db2a1108899.tar.xz puppet-c0d72265a37bffbb0becee0c46511db2a1108899.zip | |
Merge branch '0.24.x' of git://reductivelabs.com/puppet into 0.24.x
Diffstat (limited to 'lib/puppet/parser')
| -rw-r--r-- | lib/puppet/parser/collector.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/puppet/parser/collector.rb b/lib/puppet/parser/collector.rb index e0c37cd35..2699dc6e1 100644 --- a/lib/puppet/parser/collector.rb +++ b/lib/puppet/parser/collector.rb @@ -51,7 +51,7 @@ class Puppet::Parser::Collector 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. |