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

[Markus Roberts]

The following commit has been merged in the upstream branch:
commit a0ea74b5e8882e3f4e5cb1a1c396581e5484000e
Author: Jesse Wolfe <jes5199 at gmail.com>
Date:   Tue Jul 6 17:47:21 2010 -0700

    [#4149] Don't create two Resource::TypeCollections
    
    By asking the environment for known resources instead of creating a type
    collection ourselves, we avoid accidentally creating two
    Resource::TypeCollection objects.

diff --git a/lib/puppet/application/apply.rb b/lib/puppet/application/apply.rb
index 8909939..1814858 100644
--- a/lib/puppet/application/apply.rb
+++ b/lib/puppet/application/apply.rb
@@ -67,7 +67,7 @@ class Puppet::Application::Apply < Puppet::Application
             Puppet[:manifest] = command_line.args.shift
         end
         begin
-            Puppet::Resource::TypeCollection.new(Puppet[:environment]).perform_initial_import
+            Puppet::Node::Environment.new(Puppet[:environment]).known_resource_types
         rescue => detail
             Puppet.err detail
             exit 1
diff --git a/lib/puppet/application/master.rb b/lib/puppet/application/master.rb
index fdcd7d3..484ec08 100644
--- a/lib/puppet/application/master.rb
+++ b/lib/puppet/application/master.rb
@@ -67,7 +67,7 @@ class Puppet::Application::Master < Puppet::Application
 
     def parseonly
         begin
-            Puppet::Resource::TypeCollection.new(Puppet[:environment]).perform_initial_import
+            Puppet::Node::Environment.new(Puppet[:environment]).known_resource_types
         rescue => detail
             Puppet.err detail
             exit 1

-- 
Puppet packaging for Debian