More report and metrics manipulations. This should be the last of it.

git-svn-id: https://reductivelabs.com/svn/puppet/trunk@1351 980ebf18-57e1-0310-9a29-db15c13687c0

1 files changed, 9 insertions, 0 deletions

diff --git a/bin/puppetmasterd b/bin/puppetmasterd
index f254682f0..b88cf61f3 100755
--- a/bin/puppetmasterd
+++ b/bin/puppetmasterd
@@ -155,6 +155,9 @@ begin
                     Puppet::Log.newdestination(arg)
                     options[:setdest] = true
                 rescue => detail
+                    if Puppet[:debug]
+                        puts detail.backtrace
+                    end
                     $stderr.puts detail.to_s
                 end
             when "--version"
@@ -252,6 +255,9 @@ begin
     #server = Puppet::Server.new(:CA => ca)
     server = Puppet::Server.new(args)
 rescue => detail
+    if Puppet[:debug]
+        puts detail.backtrace
+    end
     $stderr.puts detail
     exit(1)
 end
@@ -260,6 +266,9 @@ if Process.uid == 0
     begin
         Puppet::Util.chuser
     rescue => detail
+        if Puppet[:debug]
+            puts detail.backtrace
+        end
         $stderr.puts "Could not change user to %s: %s" % [Puppet[:user], detail]
         exit(39)
     end