[Pkg-puppet-devel] [SCM] Puppet packaging for Debian branch, upstream, updated. 2.6.1rc1-141-gcdb2b90

[markus (none)]

The following commit has been merged in the upstream branch:
commit daa801b9ff8c81e6812a08a3f6ef82f593248e9d
Author: Nick Lewis <nick at puppetlabs.com>
Date:   Tue Jul 27 15:04:04 2010 -0700

    [#4344] Temporary fix to stop agent from importing modules
    
    Due to type collection madness, agent tries to import modules
    to resolve resource types. That is wrong, decreases performance,
    and causes problems. This patch forces agent to not import any
    files by setting ignoreimport to true.

diff --git a/lib/puppet/application/agent.rb b/lib/puppet/application/agent.rb
index f0e7f4d..2b75505 100644
--- a/lib/puppet/application/agent.rb
+++ b/lib/puppet/application/agent.rb
@@ -219,6 +219,10 @@ class Puppet::Application::Agent < Puppet::Application
 
     Puppet.settings.use :main, :agent, :ssl
 
+    # Always ignoreimport for agent. It really shouldn't even try to import,
+    # but this is just a temporary band-aid.
+    Puppet[:ignoreimport] = true
+
     # We need to specify a ca location for all of the SSL-related i
     # indirected classes to work; in fingerprint mode we just need
     # access to the local files and we don't need a ca.

-- 
Puppet packaging for Debian