diff options
| author | James Turnbull <james@lovedthanlost.net> | 2008-02-14 09:29:55 +1100 |
|---|---|---|
| committer | James Turnbull <james@lovedthanlost.net> | 2008-02-14 09:29:55 +1100 |
| commit | 0c457ee6373d436729a5d3492ca25a02c568103d (patch) | |
| tree | c120078443ea368f94b5d51ad1dc1265234226cb /bin/puppet | |
| parent | 9f224f2327ca691f4263e36708ef4e7386b2c4b4 (diff) | |
| parent | 0cfa1d2b7ae38020d3b845d7713cb10cda7facef (diff) | |
| download | puppet-0c457ee6373d436729a5d3492ca25a02c568103d.tar.gz puppet-0c457ee6373d436729a5d3492ca25a02c568103d.tar.xz puppet-0c457ee6373d436729a5d3492ca25a02c568103d.zip | |
Merge branch '0.24.x' of git://reductivelabs.com/puppet into 0.24.x
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 |