diff options
| author | Jesse Wolfe <jes5199@gmail.com> | 2010-07-09 16:09:44 -0700 |
|---|---|---|
| committer | Markus Roberts <Markus@reality.com> | 2010-07-09 16:55:04 -0700 |
| commit | 9cf9788fbbe1bd9d7d49be100d4f29b0f9908cf4 (patch) | |
| tree | f8ea85b79d3b8b4a857f6b04fa0702d0f914b2d3 | |
| parent | 835f73c72f2a7a4196633de9821a5e2cc11c1302 (diff) | |
| download | puppet-9cf9788fbbe1bd9d7d49be100d4f29b0f9908cf4.tar.gz puppet-9cf9788fbbe1bd9d7d49be100d4f29b0f9908cf4.tar.xz puppet-9cf9788fbbe1bd9d7d49be100d4f29b0f9908cf4.zip | |
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.
| -rw-r--r-- | lib/puppet/util/settings.rb | 5 |
1 files changed, 5 insertions, 0 deletions
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) |