summaryrefslogtreecommitdiffstats
path: root/lib/puppet
diff options
context:
space:
mode:
authorBrice Figureau <brice-puppet@daysofwonder.com>2009-11-11 18:29:05 +0100
committerJames Turnbull <james@lovedthanlost.net>2009-11-12 08:13:07 +1100
commit40135609c8cfc7b70369a848a383a687a216f6a7 (patch)
tree7a11301fc6e607230ca00021237858d2c3db3848 /lib/puppet
parentf05a04eabdee2299f884933010234358c41ac46d (diff)
downloadpuppet-40135609c8cfc7b70369a848a383a687a216f6a7.tar.gz
puppet-40135609c8cfc7b70369a848a383a687a216f6a7.tar.xz
puppet-40135609c8cfc7b70369a848a383a687a216f6a7.zip
Fix #2797 - tags are not inherited by recursed file sub child
This problem affects all types that generate sub-resources at evaluation or pre-transaction time. Thus it is fixed in the transaction, where we make sure we assign all parent tags to the generated child resource. A more correct fix would be to make sure we copy the whole context (ie file, line, version, tags). This fix is planned for Rowlf. Signed-off-by: Brice Figureau <brice-puppet@daysofwonder.com>
Diffstat (limited to 'lib/puppet')
-rw-r--r--lib/puppet/transaction.rb1
1 files changed, 1 insertions, 0 deletions
diff --git a/lib/puppet/transaction.rb b/lib/puppet/transaction.rb
index d04856d39..8ea8ccd1b 100644
--- a/lib/puppet/transaction.rb
+++ b/lib/puppet/transaction.rb
@@ -353,6 +353,7 @@ class Transaction
made = [made] unless made.is_a?(Array)
made.uniq.find_all do |res|
begin
+ res.tag(*resource.tags)
@catalog.add_resource(res) do |r|
r.finish
make_parent_child_relationship(resource, [r])