diff options
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/puppet/parser/ast/resource.rb | 3 | ||||
| -rw-r--r-- | lib/puppet/parser/collector.rb | 3 |
2 files changed, 2 insertions, 4 deletions
diff --git a/lib/puppet/parser/ast/resource.rb b/lib/puppet/parser/ast/resource.rb index eb0bdeac4..d222893b3 100644 --- a/lib/puppet/parser/ast/resource.rb +++ b/lib/puppet/parser/ast/resource.rb @@ -32,8 +32,7 @@ class Resource < AST::ResourceReference # because sometimes the :virtual attribute is set *after* # :exported, in which case it clobbers :exported if :exported # is true. Argh, this was a very tough one to track down. - exp = self.exported || scope.resource.exported? - virt = self.virtual || scope.resource.virtual? || exp + virt = self.virtual || self.exported # This is where our implicit iteration takes place; if someone # passed an array as the name, then we act just like the called us diff --git a/lib/puppet/parser/collector.rb b/lib/puppet/parser/collector.rb index 0f9072510..bcba9528e 100644 --- a/lib/puppet/parser/collector.rb +++ b/lib/puppet/parser/collector.rb @@ -72,8 +72,7 @@ class Puppet::Parser::Collector def collect_exported # First get everything from the export table. Just reuse our # collect_virtual method but tell it to use 'exported? for the test. - resources = collect_virtual(true).reject { |r| ! r.virtual? }.each { |r| r.exported = false } - #resources = collect_virtual(true).reject { |r| ! r.virtual? } + resources = collect_virtual(true).reject { |r| ! r.virtual? } count = resources.length |