[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 9cf9788fbbe1bd9d7d49be100d4f29b0f9908cf4
Author: Jesse Wolfe <jes5199 at gmail.com>
Date:   Fri Jul 9 16:09:44 2010 -0700

    Manifests with variables were broken when read from STDIN to puppet apply
    
    Because the new settings scope was trying to interpolate the "code"
    string, causing strange failures.

diff --git a/lib/puppet/util/settings.rb b/lib/puppet/util/settings.rb
index 34c84f7..56a13f8 100644
--- a/lib/puppet/util/settings.rb
+++ b/lib/puppet/util/settings.rb
@@ -717,6 +717,11 @@ Generated on #{Time.now}.
 
         val = uninterpolated_value(param, environment)
 
+        if param == :code
+            # if we interpolate code, all hell breaks loose.
+            return val
+        end
+
         # Convert it if necessary
         val = convert(val, environment)
 

-- 
Puppet packaging for Debian