From 3d8da88cf9c29a3e0a275aac54e195cbfc706970 Mon Sep 17 00:00:00 2001
From: Kfir Hadas <sharkykh@gmail.com>
Date: Sun, 7 May 2017 19:53:20 +0300
Subject: [PATCH] Fix git error logging (#3724)
Fix showing stderr output if stdout is empty.
---
sickbeard/versionChecker.py | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/sickbeard/versionChecker.py b/sickbeard/versionChecker.py
index 3224b7bff..f16791dca 100644
--- a/sickbeard/versionChecker.py
+++ b/sickbeard/versionChecker.py
@@ -461,10 +461,10 @@ class GitUpdateManager(UpdateManager):
elif log_errors:
if exit_status in (127, 128) or 'fatal:' in output:
- logger.log("{0} returned : ({1}) {2}".format(cmd, exit_status, str(output) or str(err)), logger.WARNING)
+ logger.log("{0} returned : ({1}) {2}".format(cmd, exit_status, str(output or err)), logger.WARNING)
else:
logger.log("{0} returned code {1}, treating as error : {2}"
- .format(cmd, exit_status, str(output) or str(err)), logger.ERROR)
+ .format(cmd, exit_status, str(output or err)), logger.ERROR)
exit_status = 1
return output, err, exit_status
--
GitLab