Looks like the only time the report could be nil is if there's some  
error in running the catalog, so this should go away once we fix it so  
report creation/sending is decoupled from the transaction.

+1

On Dec 18, 2009, at 2:55 PM, Markus Roberts wrote:

> Signed-off-by: Markus Roberts <[email protected]>
> ---
> lib/puppet/application/puppetd.rb |    4 +++-
> 1 files changed, 3 insertions(+), 1 deletions(-)
>
> diff --git a/lib/puppet/application/puppetd.rb b/lib/puppet/ 
> application/puppetd.rb
> index c1f7331..4230719 100644
> --- a/lib/puppet/application/puppetd.rb
> +++ b/lib/puppet/application/puppetd.rb
> @@ -114,7 +114,9 @@ Puppet::Application.new(:puppetd) do
>             Puppet.err detail.to_s
>         end
>
> -        if not Puppet[:noop] and options[:detailed_exitcodes] then
> +        if not report
> +            exit(1)
> +        elsif not Puppet[:noop] and options[:detailed_exitcodes] then
>             exit(report.exit_status)
>         else
>             exit(0)
> -- 
> 1.6.4
>
> --
>
> You received this message because you are subscribed to the Google  
> Groups "Puppet Developers" group.
> To post to this group, send email to [email protected].
> To unsubscribe from this group, send email to 
> [email protected] 
> .
> For more options, visit this group at 
> http://groups.google.com/group/puppet-dev?hl=en 
> .
>
>


-- 
The reasonable man adapts himself to the world; the unreasonable one
persists in trying to adapt the world to himself. Therefore all
progress depends on the unreasonable man. -- George Bernard Shaw
---------------------------------------------------------------------
Luke Kanies  -|-   http://reductivelabs.com   -|-   +1(615)594-8199

--

You received this message because you are subscribed to the Google Groups 
"Puppet Developers" group.
To post to this group, send email to [email protected].
To unsubscribe from this group, send email to 
[email protected].
For more options, visit this group at 
http://groups.google.com/group/puppet-dev?hl=en.


Reply via email to