diff options
| author | Luke Kanies <luke@madstop.com> | 2007-10-05 11:46:35 -0500 |
|---|---|---|
| committer | Luke Kanies <luke@madstop.com> | 2007-10-05 11:46:35 -0500 |
| commit | 9c58c476c2ffcf9613f14e5881b1177f01d413a7 (patch) | |
| tree | 8791274ce754f486f039ba942e3a5d3d9939df3e /bin/puppet | |
| parent | d35cd947c82ba9da8ec798100a3c710c34492521 (diff) | |
| download | puppet-9c58c476c2ffcf9613f14e5881b1177f01d413a7.tar.gz puppet-9c58c476c2ffcf9613f14e5881b1177f01d413a7.tar.xz puppet-9c58c476c2ffcf9613f14e5881b1177f01d413a7.zip | |
Adding a :code setting for specifying code to run
instead of a manifest, and removing all of the ambiguity
around whether an interpreter gets its own file specified
or uses the central setting.
Most of the changes are around fixing existing tests to use this new system.
Diffstat (limited to 'bin/puppet')
| -rwxr-xr-x | bin/puppet | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/bin/puppet b/bin/puppet index a5aa030ac..b004111c9 100755 --- a/bin/puppet +++ b/bin/puppet @@ -166,7 +166,7 @@ Puppet.genmanifest # Set our code or file to use. if options[:code] or ARGV.length == 0 - Puppet::Node::Configuration.code = options[:code] || STDIN.read + Puppet[:code] = options[:code] || STDIN.read else Puppet[:manifest] = ARGV.shift end |