diff options
| author | Brice Figureau <brice-puppet@daysofwonder.com> | 2009-07-09 20:59:41 +0200 |
|---|---|---|
| committer | James Turnbull <james@lovedthanlost.net> | 2009-07-18 10:31:10 +1000 |
| commit | b2a008e30ea57f0c94d605de855c45c0fdf0e5ce (patch) | |
| tree | c64527d7d056c9d67e0ed78e44234b07e3082c36 /lib/puppet/transaction.rb | |
| parent | 8f8240763b0a8ab74b5b78eeb2372a2aa7848049 (diff) | |
| download | puppet-b2a008e30ea57f0c94d605de855c45c0fdf0e5ce.tar.gz puppet-b2a008e30ea57f0c94d605de855c45c0fdf0e5ce.tar.xz puppet-b2a008e30ea57f0c94d605de855c45c0fdf0e5ce.zip | |
Fix #2391 - Exported resources never make to the storeconfigs db
The issue is that when we convert Puppet::Parser::Resource catalog
to a Puppet::Resource catalog before storing it to the database,
we don't allow virtual resource to be converted.
Unfortunately exported resources are virtual by design, and as
such aren't converted, and we lose them, so it isn't possible
to store them in the database.
Unfortunately, the client will get the exported resources too.
The fix is dual-fold:
* we make sure exported resource are skipped when the transaction is
applied as a last safeguard
* we filter-out the catalog through the catalog compiler terminus before
the catalog is returned to the client
Signed-off-by: Brice Figureau <brice-puppet@daysofwonder.com>
Diffstat (limited to 'lib/puppet/transaction.rb')
| -rw-r--r-- | lib/puppet/transaction.rb | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/lib/puppet/transaction.rb b/lib/puppet/transaction.rb index f09ca804b..ea283d8bb 100644 --- a/lib/puppet/transaction.rb +++ b/lib/puppet/transaction.rb @@ -592,6 +592,8 @@ class Transaction resource.debug "Not scheduled" elsif failed_dependencies?(resource) resource.warning "Skipping because of failed dependencies" + elsif resource.exported? + resource.debug "Skipping because exported" else return false end |