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

[Markus Roberts]

The following commit has been merged in the upstream branch:
commit f43e87bb638b30608e1773a9afb48a8639feb3cd
Author: Markus Roberts <Markus at reality.com>
Date:   Fri Aug 6 09:40:47 2010 -0700

    Fix for #4476 -- rails calling yaml internals
    
    Some recent versions of rails have started calling yaml with the internal
    (and IIRC depricated) signature; this does nothing special in yaml but it
    breaks with zaml, so we add an ignored parameter to simulate the non-behavior.
    
    *sigh*  I love rails.

diff --git a/lib/puppet/util/monkey_patches.rb b/lib/puppet/util/monkey_patches.rb
index 9664ff3..6b5af83 100644
--- a/lib/puppet/util/monkey_patches.rb
+++ b/lib/puppet/util/monkey_patches.rb
@@ -25,7 +25,7 @@ end
 
 [Object, Exception, Integer, Struct, Date, Time, Range, Regexp, Hash, Array, Float, String, FalseClass, TrueClass, Symbol, NilClass, Class].each { |cls|
   cls.class_eval do
-    def to_yaml
+    def to_yaml(ignored=nil)
       ZAML.dump(self)
     end
   end

-- 
Puppet packaging for Debian