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

[test branch]

The following commit has been merged in the upstream branch:
commit c59d864ecdf5a1a7c9075c6dd40faea0d15ebc36
Author: David Schmitt <david at dasz.at>
Date:   Fri May 14 13:12:41 2010 +0200

    Avoid non-win32 signals on win32 runtime

diff --git a/lib/puppet/daemon.rb b/lib/puppet/daemon.rb
index b6dbf26..a8c0495 100755
--- a/lib/puppet/daemon.rb
+++ b/lib/puppet/daemon.rb
@@ -95,7 +95,10 @@ class Puppet::Daemon
     # Trap a couple of the main signals.  This should probably be handled
     # in a way that anyone else can register callbacks for traps, but, eh.
     def set_signal_traps
-        {:INT => :stop, :TERM => :stop, :HUP => :restart, :USR1 => :reload, :USR2 => :reopen_logs}.each do |signal, method|
+        signals = {:INT => :stop, :TERM => :stop }
+        # extended signals not supported under windows
+        signals.update({:HUP => :restart, :USR1 => :reload, :USR2 => :reopen_logs }) unless Puppet.features.win32?
+        signals.each do |signal, method|
             trap(signal) do
                 Puppet.notice "Caught #{signal}; calling #{method}"
                 send(method)

-- 
Puppet packaging for Debian