diff --git a/SickBeard.py b/SickBeard.py index f6ed7ef2c8759c68a2c3958a3a04322817fb2bc2..2d9df1f15222031aab502e73e478522c882e2ecf 100755 --- a/SickBeard.py +++ b/SickBeard.py @@ -295,15 +295,11 @@ class SickRage(object): os.chdir(sickbeard.DATA_DIR) # Check if we need to perform a restore first - try: - restoreDir = os.path.join(sickbeard.DATA_DIR, 'restore') - if self.consoleLogging and os.path.exists(restoreDir): - if self.restoreDB(restoreDir, sickbeard.DATA_DIR): - sys.stdout.write("Restore: restoring DB and config.ini successful...\n") - else: - sys.stdout.write("Restore: restoring DB and config.ini FAILED!\n") - except Exception: - sys.stdout.write("Restore: restoring DB and config.ini FAILED!\n") + restoreDir = os.path.join(sickbeard.DATA_DIR, 'restore') + if os.path.exists(restoreDir): + success = self.restoreDB(restoreDir, sickbeard.DATA_DIR) + if self.consoleLogging: + sys.stdout.write("Restore: restoring DB and config.ini %s!\n" % ("FAILED", "SUCCESSFUL")[success]) # Load the config and publish it to the sickbeard package if self.consoleLogging and not os.path.isfile(sickbeard.CONFIG_FILE):