From d5daa14dc0463e53964461e16a8bcd60f12e5a50 Mon Sep 17 00:00:00 2001 From: Adam Date: Sun, 12 Oct 2014 17:28:58 +0800 Subject: [PATCH] Fixes crash on general settings page when git output is none --- sickbeard/versionChecker.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/sickbeard/versionChecker.py b/sickbeard/versionChecker.py index 014c7413..e0e78075 100644 --- a/sickbeard/versionChecker.py +++ b/sickbeard/versionChecker.py @@ -378,7 +378,7 @@ class GitUpdateManager(UpdateManager): if output: output = output.strip() - logger.log(u"git output: " + output, logger.DEBUG) + logger.log(u"git output: " + str(output), logger.DEBUG) except OSError: logger.log(u"Command " + cmd + " didn't work") @@ -389,15 +389,15 @@ class GitUpdateManager(UpdateManager): exit_status = 0 elif exit_status == 1: - logger.log(cmd + u" returned : " + output, logger.ERROR) + logger.log(cmd + u" returned : " + str(output), logger.ERROR) exit_status = 1 elif exit_status == 128 or 'fatal:' in output or err: - logger.log(cmd + u" returned : " + output, logger.ERROR) + logger.log(cmd + u" returned : " + str(output), logger.ERROR) exit_status = 128 else: - logger.log(cmd + u" returned : " + output + u", treat as error for now", logger.ERROR) + logger.log(cmd + u" returned : " + str(output) + u", treat as error for now", logger.ERROR) exit_status = 1 return (output, err, exit_status)