From fa740203ba7af7e797d082657f77ba1b11be6cd8 Mon Sep 17 00:00:00 2001 From: Jesse Wolfe Date: Sun, 11 Jul 2010 20:42:19 -0700 Subject: [#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. --- lib/puppet/resource/catalog.rb | 4 ++++ 1 file changed, 4 insertions(+) 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']) -- cgit