From 9cf9788fbbe1bd9d7d49be100d4f29b0f9908cf4 Mon Sep 17 00:00:00 2001
From: Jesse Wolfe <jes5199@gmail.com>
Date: Fri, 9 Jul 2010 16:09:44 -0700
Subject: 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.
---
 lib/puppet/util/settings.rb | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'lib/puppet')

diff --git a/lib/puppet/util/settings.rb b/lib/puppet/util/settings.rb
index 34c84f7ae..56a13f847 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)
 
-- 
cgit