[Pkg-puppet-devel] [SCM] Puppet packaging for Debian branch, upstream, updated. 2.6.1rc3-129-g74f8285

[James Turnbull]

The following commit has been merged in the upstream branch:
commit e91a8cc975216501f764f5f2dea40d72154dc426
Author: Jesse Wolfe <jes5199 at gmail.com>
Date:   Fri Aug 13 12:24:08 2010 -0700

    [#4462] uncaught Timeout::Error
    
    puppet agent was not catching all species of exceptions, causing it to
    crash on net/http timeout errors.
    This patch broadens the types of exceptions that are caught.

diff --git a/lib/puppet/agent.rb b/lib/puppet/agent.rb
index 52acc64..47dd44a 100644
--- a/lib/puppet/agent.rb
+++ b/lib/puppet/agent.rb
@@ -37,7 +37,9 @@ class Puppet::Agent
       with_client do |client|
         begin
           sync.synchronize { lock { result = client.run(*args) } }
-        rescue => detail
+        rescue SystemExit,NoMemoryError
+          raise
+        rescue Exception => detail
           puts detail.backtrace if Puppet[:trace]
           Puppet.err "Could not run #{client_class}: #{detail}"
         end

-- 
Puppet packaging for Debian