[Pkg-puppet-devel] [SCM] Puppet packaging for Debian branch, upstream, updated. 0.25.5-639-g8f94f35

Jesse Wolfe jes5199 at gmail.com
Wed Jul 14 10:37:34 UTC 2010


The following commit has been merged in the upstream branch:
commit fa740203ba7af7e797d082657f77ba1b11be6cd8
Author: Jesse Wolfe <jes5199 at gmail.com>
Date:   Sun Jul 11 20:42:19 2010 -0700

    [#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.

diff --git a/lib/puppet/resource/catalog.rb b/lib/puppet/resource/catalog.rb
index e8c1429..d163fc1 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'])
 

-- 
Puppet packaging for Debian



More information about the Pkg-puppet-devel mailing list