Use exceptions for error handling

[rarslave2.git] / PAR2Set / NoExtract.py

diff --git a/PAR2Set/NoExtract.py b/PAR2Set/NoExtract.py
index 51ee235..9b4ea46 100644 (file)
--- a/PAR2Set/NoExtract.py
+++ b/PAR2Set/NoExtract.py
@@ -94,21 +94,20 @@ class NoExtract (PAR2Set.Base.Base):
                """Run the Repair and Deletion stages, omitting the Extraction stage"""
 
                # Repair Stage
-               ret = self.runVerifyAndRepair ()
-
-               if ret != rsutil.common.SUCCESS:
-                       logging.critical ('Repair stage failed for: %s' % self.p2file)
-                       return -rsutil.common.ECHECK
+               try:
+                       self.runVerifyAndRepair()
+               except (RuntimeError, OSError):
+                       logging.critical('Repair stage failed for: %s' % self.p2file)
+                       raise
 
                self.update_matches ()
 
                # Deletion Stage
-               ret = self.runDelete ()
-
-               if ret != rsutil.common.SUCCESS:
-                       logging.critical ('Deletion stage failed for: %s' % self.p2file)
-                       return -rsutil.common.EDELETE
+               try:
+                       self.runDelete()
+               except (RuntimeError, OSError):
+                       logging.critical('Delete stage failed for: %s' % self.p2file)
+                       raise
 
                logging.info ('Successfully completed: %s' % self.p2file)
-               return rsutil.common.SUCCESS