diff options
| author | Luke Kanies <luke@madstop.com> | 2007-11-08 16:03:56 -0600 |
|---|---|---|
| committer | Luke Kanies <luke@madstop.com> | 2007-11-08 16:03:56 -0600 |
| commit | f775572bae39b07b21278fdff60f44620c4f4598 (patch) | |
| tree | 0f391b3516a9c0621cb5b7e5ec62bbf91bfca218 /lib/puppet/parser/collector.rb | |
| parent | ba19989c6eab23f3897da20ed8a505ede9198d8b (diff) | |
| parent | b250416c272ded3e33cdfbb7ac1de989a1b92094 (diff) | |
| download | puppet-f775572bae39b07b21278fdff60f44620c4f4598.tar.gz puppet-f775572bae39b07b21278fdff60f44620c4f4598.tar.xz puppet-f775572bae39b07b21278fdff60f44620c4f4598.zip | |
Merge commit 'davids-bugfixes/rest/fix-731'
Diffstat (limited to 'lib/puppet/parser/collector.rb')
| -rw-r--r-- | lib/puppet/parser/collector.rb | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/lib/puppet/parser/collector.rb b/lib/puppet/parser/collector.rb index 3eb37dfa2..e3c91bccb 100644 --- a/lib/puppet/parser/collector.rb +++ b/lib/puppet/parser/collector.rb @@ -23,7 +23,8 @@ class Puppet::Parser::Collector host = Puppet::Rails::Host.find_by_name(@scope.host) args = {:include => {:param_values => :param_name}} - args[:conditions] = "(exported = 't' AND restype = '%s')" % [@type] + args[:conditions] = "(exported = %s AND restype = '%s')" % + [ActiveRecord::Base.connection.quote(true), @type] if @equery args[:conditions] += " AND (%s)" % [@equery] end |