diff options
Diffstat (limited to 'lib/puppet/configurer.rb')
| -rw-r--r-- | lib/puppet/configurer.rb | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/lib/puppet/configurer.rb b/lib/puppet/configurer.rb index 82158e0fd..5b8174588 100644 --- a/lib/puppet/configurer.rb +++ b/lib/puppet/configurer.rb @@ -78,11 +78,11 @@ class Puppet::Configurer # Prepare for catalog retrieval. Downloads everything necessary, etc. def prepare - dostorage() + dostorage - download_plugins() + download_plugins - download_fact_plugins() + download_fact_plugins execute_prerun_command end @@ -93,7 +93,7 @@ class Puppet::Configurer # This is a bit complicated. We need the serialized and escaped facts, # and we need to know which format they're encoded in. Thus, we # get a hash with both of these pieces of information. - fact_options = facts_for_uploading() + fact_options = facts_for_uploading else fact_options = {} end @@ -126,7 +126,7 @@ class Puppet::Configurer # which accepts :tags and :ignoreschedules. def run(options = {}) begin - prepare() + prepare rescue SystemExit,NoMemoryError raise rescue Exception => detail @@ -134,7 +134,7 @@ class Puppet::Configurer Puppet.err "Failed to prepare catalog: #{detail}" end - options[:report] ||= initialize_report() + options[:report] ||= initialize_report report = options[:report] Puppet::Util::Log.newdestination(report) @@ -171,7 +171,7 @@ class Puppet::Configurer def send_report(report, trans = nil) trans.generate_report if trans puts report.summary if Puppet[:summarize] - report.save() if Puppet[:report] + report.save if Puppet[:report] rescue => detail puts detail.backtrace if Puppet[:trace] Puppet.err "Could not send report: #{detail}" |