diff options
| author | Jesse Wolfe <jes5199@gmail.com> | 2010-07-11 20:42:19 -0700 |
|---|---|---|
| committer | Jesse Wolfe <jes5199@gmail.com> | 2010-07-11 20:42:19 -0700 |
| commit | fa740203ba7af7e797d082657f77ba1b11be6cd8 (patch) | |
| tree | 3b5ed7619d822bf42af47ad527a98a9194768374 | |
| parent | f5f9a382deb6d7bf814b6f180a39793c55bc36b2 (diff) | |
| download | puppet-fa740203ba7af7e797d082657f77ba1b11be6cd8.tar.gz puppet-fa740203ba7af7e797d082657f77ba1b11be6cd8.tar.xz puppet-fa740203ba7af7e797d082657f77ba1b11be6cd8.zip | |
[#4209] catalog.resources should return resources
type/user.rb was assuming that catalog.resources would return resources.
In 0.25.x, it (confusingly) returns strings. type/user ignored this, and
the codepath was a no-op.
In 2.6, the method was renamed to something less confusing, causing the
codepath in type/user to fail outright.
This patch added a catalog.resources method that returns resource
objects.
As a side effect, user resources will now autorequire group resources
again.
| -rw-r--r-- | lib/puppet/resource/catalog.rb | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/lib/puppet/resource/catalog.rb b/lib/puppet/resource/catalog.rb index e8c142965..d163fc17e 100644 --- a/lib/puppet/resource/catalog.rb +++ b/lib/puppet/resource/catalog.rb @@ -383,6 +383,10 @@ class Puppet::Resource::Catalog < Puppet::SimpleGraph @resource_table.keys end + def resources + @resource_table.values.uniq + end + def self.from_pson(data) result = new(data['name']) |