← Back to branch summary

~ubuntu-branches/ubuntu/trusty/puppet/trusty

« back to all changes in this revision

Viewing changes to lib/puppet/parser/ast/collection.rb

  • Committer: Package Import Robot
  • Author(s): Stig Sandbeck Mathisen
  • Date: 2011-10-22 14:08:22 UTC
  • mfrom: (1.1.25) (3.1.32 sid)
  • Revision ID: package-import@ubuntu.com-20111022140822-odxde5lohc45yhuz
Tags: 2.7.6-1
* New upstream release (CVE-2011-3872)
* Remove cherry-picked "groupadd_aix_warning" patch
* Install all new manpages

Show diffs side-by-side

added added

removed removed

Lines of Context:
lib/puppet/parser/ast/collection.rb
13
13
 
14
14
    # We return an object that does a late-binding evaluation.
15
15
    def evaluate(scope)
16
 
      str, code = query && query.safeevaluate(scope)
 
16
      match, code = query && query.safeevaluate(scope)
17
17
 
18
18
      resource_type = scope.find_resource_type(@type)
19
19
      fail "Resource type #{@type} doesn't exist" unless resource_type
20
 
      newcoll = Puppet::Parser::Collector.new(scope, resource_type.name, str, code, self.form)
 
20
      newcoll = Puppet::Parser::Collector.new(scope, resource_type.name, match, code, self.form)
21
21
 
22
22
      scope.compiler.add_collection(newcoll)
23
23