X-Git-Url: https://www.irasnyder.com/gitweb/?p=rarslave2.git;a=blobdiff_plain;f=PAR2Set%2FNoExtract.py;h=9b4ea4651f0bd7c7cd5c34a411a27de1b5559aa7;hp=51ee235e9205ab59c4b954b725a7cf0820b93255;hb=3e0a5dd7c7549636eb70c6a641987da66742f1db;hpb=f66165cb39c650eb1cec0b24e07940760d602ffa diff --git a/PAR2Set/NoExtract.py b/PAR2Set/NoExtract.py index 51ee235..9b4ea46 100644 --- 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