diff options
| author | Luke Kanies <luke@madstop.com> | 2007-12-22 21:44:37 -0600 |
|---|---|---|
| committer | Luke Kanies <luke@madstop.com> | 2007-12-22 21:44:37 -0600 |
| commit | 1deb7fd487dca1046beb933dca2cccadf44fa6f5 (patch) | |
| tree | 06343d67499adecb28c4465fd15c92ad9336e109 /bin/puppet | |
| parent | f3fd7091d3db9dff1b177867589289890e9a3a66 (diff) | |
| parent | c4ed43c2a1ad9ab865e3da6b8b7fad28222c3451 (diff) | |
| download | puppet-1deb7fd487dca1046beb933dca2cccadf44fa6f5.tar.gz puppet-1deb7fd487dca1046beb933dca2cccadf44fa6f5.tar.xz puppet-1deb7fd487dca1046beb933dca2cccadf44fa6f5.zip | |
Merge branch '0.24.x'
Conflicts:
conf/redhat/puppet.spec
Diffstat (limited to 'bin/puppet')
| -rwxr-xr-x | bin/puppet | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/bin/puppet b/bin/puppet index 13e99e2a6..f5d230a7a 100755 --- a/bin/puppet +++ b/bin/puppet @@ -198,9 +198,13 @@ 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 + catalog.finalize + # And apply it catalog.apply rescue => detail |