[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 59718988af6c80451973c37e78c23cef7b171edc
Author: Markus Roberts <Markus at reality.com>
Date:   Tue Jul 6 10:23:52 2010 -0700

    Fix for #4142 stray use of JSON instead of PSON
    
    Somehow one use of JSON escaped the global find and replace of PSON --> JSON.

diff --git a/lib/puppet/module.rb b/lib/puppet/module.rb
index 38f3ec6..1ea3df0 100644
--- a/lib/puppet/module.rb
+++ b/lib/puppet/module.rb
@@ -109,7 +109,7 @@ class Puppet::Module
     end
 
     def load_metadata
-        data = JSON.parse File.read(metadata_file)
+        data = PSON.parse File.read(metadata_file)
         [:source, :author, :version, :license, :puppetversion].each do |attr|
             unless value = data[attr.to_s]
                 unless attr == :puppetversion

-- 
Puppet packaging for Debian