Skip to content

Commit 02d2978

Browse files
committed
[update-checkout] Decode stderr from failed update command
Otherwise, the error message gets printed as a Python binary string, e.g. you see ``` b'error: Your local changes to the following files would be overwritten by checkout:\n\tinclude/swift/IDE/CodeCompletion.h\n\tutils/update_checkout/update_checkout/update_checkout.py\nPlease commit your changes or stash them before you switch branches.\nAborting\n' ``` instead of ``` error: Your local changes to the following files would be overwritten by checkout: include/swift/IDE/CodeCompletion.h utils/update_checkout/update_checkout/update_checkout.py Please commit your changes or stash them before you switch branches. Aborting ```
1 parent 237338b commit 02d2978

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

utils/update_checkout/update_checkout/update_checkout.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ def check_parallel_results(results, op):
7070
print("%s failed (ret=%d): %s" % (r.repo_path, r.ret, r))
7171
fail_count += 1
7272
if r.stderr:
73-
print(r.stderr)
73+
print(r.stderr.decode('utf-8'))
7474
return fail_count
7575

7676

0 commit comments

Comments
 (0)