diff --git a/changelog.md b/changelog.md index 9123cbb..29cf43c 100644 --- a/changelog.md +++ b/changelog.md @@ -1,6 +1,9 @@ # NZB Hydra changelog ---------- +### 0.2.204 +Fixed: Prevent exception when logging failed git output. See [#555](https://github.com/theotherp/nzbhydra/issues/555). + ### 0.2.203 Added: Properly log or open browser to ipv6 address. See [#554](https://github.com/theotherp/nzbhydra/issues/554). diff --git a/nzbhydra/update.py b/nzbhydra/update.py index e285737..19e8327 100644 --- a/nzbhydra/update.py +++ b/nzbhydra/update.py @@ -265,26 +265,26 @@ def _run_git(self, git_path, args): if output: output = output.strip() - logger.info("git output: " + output) + logger.info("git output: %s" % output) except OSError: - logger.error("Command " + cmd + " didn't work") + logger.error("Command %s didn't work" % cmd) exit_status = 1 if exit_status == 0: - logger.debug(cmd + " : returned successful") + logger.debug("%s : returned successful" % cmd) exit_status = 0 elif exit_status == 1: - logger.error(cmd + " returned : " + output) + logger.error("%s returned : %s" % (cmd, output)) exit_status = 1 elif exit_status == 128 or 'fatal:' in output or err: - logger.error(cmd + " returned : " + output) + logger.error("%s returned : %s" % (cmd, output)) exit_status = 128 else: - logger.error(cmd + " returned : " + output + ", treat as error for now") + logger.error("%s returned : %s, treat as error for now" % (cmd, output)) exit_status = 1 return output, err, exit_status diff --git a/version.txt b/version.txt index 5817756..12f3e74 100644 --- a/version.txt +++ b/version.txt @@ -1 +1 @@ -0.2.203 \ No newline at end of file +0.2.204 \ No newline at end of file