[Docutils-checkins] r4208 - trunk/docutils/docutils/core.py

[<go...@us...>]

Author: goodger
Date: 2005-12-14 03:12:00 +0100 (Wed, 14 Dec 2005)
New Revision: 4208

Modified:
   trunk/docutils/docutils/core.py
Log:
corrected r4199

Modified: trunk/docutils/docutils/core.py
===================================================================
--- trunk/docutils/docutils/core.py	2005-12-14 02:10:34 UTC (rev 4207)
+++ trunk/docutils/docutils/core.py	2005-12-14 02:12:00 UTC (rev 4208)
@@ -194,7 +194,6 @@
         `self.writer`'s output.
         """
         exit = None
-        exit_status = 0
         try:
             if self.settings is None:
                 self.process_command_line(
@@ -206,13 +205,15 @@
             self.apply_transforms()
             output = self.writer.write(self.document, self.destination)
             self.writer.assemble_parts()
-        except SystemExit:
+        except SystemExit, error:
             exit = 1
+            exit_status = error.code
         except Exception, error:
-            if not self.settings or self.settings.traceback:
-                # Propagate exceptions.
-                self.debugging_dumps()                
+            if not self.settings:       # exception too early to report nicely
                 raise
+            if self.settings.traceback: # Propagate exceptions?
+                self.debugging_dumps()
+                raise
             self.report_Exception(error)
             exit = 1
             exit_status = 1