Make sure stdout is a string when we try to treat it as such...

2015-08-27 16:43:58 +02:00 · 2015-08-27 16:43:58 +02:00 · 51b1535a29
commit 51b1535a29
parent b4bb54aca6
1 changed files with 2 additions and 1 deletions
--- a/src/octoprint/plugins/softwareupdate/scripts/update-octoprint.py
+++ b/src/octoprint/plugins/softwareupdate/scripts/update-octoprint.py
@ -93,7 +93,8 @@ def _git(args, cwd, verbose=False, git_executable=None):

 	for c in commands:
 		try:
-			return _execute([c] + args, cwd=cwd)
+			returncode, stdout, stderr = _execute([c] + args, cwd=cwd)
+			return returncode, "\n".join(stdout), "\n".join(stderr)
 		except EnvironmentError:
 			e = sys.exc_info()[1]
 			if e.errno == errno.ENOENT: