diff --git a/SickBeard.py b/SickBeard.py index 93804966f8ee6166c2c83a9096a7538ef016db9c..f6ce75ba73a9863d2e649cc49284aeb4f80bf2f6 100755 --- a/SickBeard.py +++ b/SickBeard.py @@ -106,13 +106,11 @@ class SickRage(object): @staticmethod def clear_cache(): try: - cache_folder = ek(os.path.join, sickbeard.CACHE_DIR, 'mako') + cache_folder = ek(os.path.join, sickbeard.CACHE_DIR, 'mako') if os.path.isdir(cache_folder): shutil.rmtree(cache_folder) - return True except Exception: - pass - return False + logger.log(u"Unable to remove the cache/mako directory!", logger.WARNING) @staticmethod def help_message(): @@ -312,15 +310,12 @@ class SickRage(object): # Build from the DB to start with self.loadShowsFromDB() - if self.consoleLogging: - print "Starting up SickRage " + sickbeard.BRANCH + " from " + sickbeard.CONFIG_FILE + logger.log(u"Starting up SickRage [%s] from '%s'" % (sickbeard.BRANCH, sickbeard.CONFIG_FILE)) - # Clean up after update - if not self.clear_cache(): - print u"Unable to remove the cache/mako directory!" + self.clear_cache() if self.forcedPort: - print u"Forcing web server to port %s" % self.forcedPort + logger.log(u"Forcing web server to port %s" % self.forcedPort) self.startPort = self.forcedPort else: self.startPort = sickbeard.WEB_PORT @@ -509,8 +504,7 @@ class SickRage(object): pass # Clean cache - if not self.clear_cache(): - logger.log(u"Halt: Unable to remove the cache/mako directory!", logger.WARNING) + self.clear_cache() # if run as daemon delete the pidfile if self.runAsDaemon and self.CREATEPID: