diff options
| author | Luke Kanies <luke@madstop.com> | 2008-02-18 09:38:32 -0600 |
|---|---|---|
| committer | Luke Kanies <luke@madstop.com> | 2008-02-18 09:38:32 -0600 |
| commit | a53106cf08c28e996502cba703f64944250a4b29 (patch) | |
| tree | 4dee55340a4d91083e940fecb9087ecfaa7c279f /bin/puppet | |
| parent | be58bb5c4bc19e59685e0a8953eaf2d3b7844110 (diff) | |
| parent | 62d7616a457f33eb660454fcdcefe8dab84522c0 (diff) | |
| download | puppet-a53106cf08c28e996502cba703f64944250a4b29.tar.gz puppet-a53106cf08c28e996502cba703f64944250a4b29.tar.xz puppet-a53106cf08c28e996502cba703f64944250a4b29.zip | |
Merge branch '0.24.x'
Conflicts:
CHANGELOG
man/man8/puppet.8
Diffstat (limited to 'bin/puppet')
| -rwxr-xr-x | bin/puppet | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/bin/puppet b/bin/puppet index f5d230a7a..952ffcbf8 100755 --- a/bin/puppet +++ b/bin/puppet @@ -171,6 +171,16 @@ else Puppet[:manifest] = ARGV.shift end +if Puppet[:parseonly] + begin + Puppet::Parser::Interpreter.new.parser(Puppet[:environment]) + rescue => detail + Puppet.err detail + exit 1 + end + exit 0 +end + # Collect our facts. facts = Puppet::Node::Facts.find("me") facts.name = facts.values["hostname"] @@ -198,8 +208,6 @@ begin # Compile our catalog catalog = Puppet::Node::Catalog.find(node) - exit(0) if Puppet[:parseonly] - # Translate it to a RAL catalog catalog = catalog.to_ral |