diff options
| author | James Turnbull <james@lovedthanlost.net> | 2008-07-05 10:20:54 +1000 |
|---|---|---|
| committer | James Turnbull <james@lovedthanlost.net> | 2008-07-05 10:20:54 +1000 |
| commit | 083f4ca7862fbde5cb6fb5562be10f13b66d9250 (patch) | |
| tree | 72a3a016b8a692dfcdc12b6392059f89a93b2330 /lib/puppet | |
| parent | f4201a2b0a754ab6f276f4bf6e4fe7a976a1721e (diff) | |
| parent | 196494a63eafc495224c1bfea933740fad7d76f0 (diff) | |
| download | puppet-083f4ca7862fbde5cb6fb5562be10f13b66d9250.tar.gz puppet-083f4ca7862fbde5cb6fb5562be10f13b66d9250.tar.xz puppet-083f4ca7862fbde5cb6fb5562be10f13b66d9250.zip | |
Merge branch 'tickets/0.24.x/1231' of git://github.com/lak/puppet into 0.24.x
Diffstat (limited to 'lib/puppet')
| -rw-r--r-- | lib/puppet/util/settings.rb | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/lib/puppet/util/settings.rb b/lib/puppet/util/settings.rb index d8197f743..f20dee401 100644 --- a/lib/puppet/util/settings.rb +++ b/lib/puppet/util/settings.rb @@ -731,8 +731,10 @@ Generated on #{Time.now}. begin catalog.host_config = false catalog.apply do |transaction| - if failures = transaction.any_failed? - raise "Could not configure for running; got %s failure(s)" % failures + if transaction.any_failed? + report = transaction.report + failures = report.logs.find_all { |log| log.level == :err } + raise "Got %s failure(s) while initializing: %s" % [failures.length, failures.collect { |l| l.to_s }.join("; ")] end end ensure |