wrapping all work in a single rescue clause

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

1 files changed, 7 insertions, 18 deletions

diff --git a/bin/puppet b/bin/puppet
index 938877dc3..44c500f6a 100755
--- a/bin/puppet
+++ b/bin/puppet
@@ -144,30 +144,19 @@ master[:File] = ARGV.shift
 
 begin
     server = Puppet::Server::Master.new(master)
-rescue => detail
-    $stderr.puts detail
-    exit(1)
-end
-
-begin
     client = Puppet::Client::MasterClient.new(
         :Master => server,
         :Cache => false
     )
-rescue => detail
-    $stderr.puts detail
-    exit(1)
-end
-
-
-if parseonly
-    exit(0)
-end
-
-begin
+    if parseonly
+        exit(0)
+    end
     client.getconfig
     client.apply
 rescue => detail
-    Puppet.err detail
+    $stderr.puts detail
+    if Puppet[:debug]
+        puts detail.backtrace
+    end
     exit(1)
 end