diff options
author | drott <drott@chromium.org> | 2015-08-17 23:27:00 -0700 |
---|---|---|
committer | Commit bot <commit-bot@chromium.org> | 2015-08-18 06:27:33 +0000 |
commit | 7813ff35ac515acf6bf5e282081d5a9a54b30fc7 (patch) | |
tree | 9c3b24e5021ae08b99dc9b863dcfd50e29c740bc /tools/check_git_config.py | |
parent | e962293dc947e79041a1a2179e6910dec25d5315 (diff) | |
download | chromium_src-7813ff35ac515acf6bf5e282081d5a9a54b30fc7.zip chromium_src-7813ff35ac515acf6bf5e282081d5a9a54b30fc7.tar.gz chromium_src-7813ff35ac515acf6bf5e282081d5a9a54b30fc7.tar.bz2 |
Fix encoding issue in check_git_config
Fix for
"Unicode equal comparison failed to convert both arguments to Unicode"
when the git username contains non-ascii characters. Fixed by
utf-8 decoding data imported from git.
BUG=521519
Review URL: https://codereview.chromium.org/1301453003
Cr-Commit-Position: refs/heads/master@{#343836}
Diffstat (limited to 'tools/check_git_config.py')
-rwxr-xr-x | tools/check_git_config.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/check_git_config.py b/tools/check_git_config.py index ecdfc44..17b0d1e 100755 --- a/tools/check_git_config.py +++ b/tools/check_git_config.py @@ -111,7 +111,7 @@ def read_git_config(prop): proc = subprocess.Popen( [GIT_EXE, 'config', prop], stdout=subprocess.PIPE, cwd=REPO_ROOT) out, _ = proc.communicate() - return out.strip() + return out.strip().decode('utf-8') except OSError as exc: if exc.errno != errno.ENOENT: logging.exception('Unexpected error when calling git') |