diff options
author | Mike Frysinger <vapier@google.com> | 2020-02-11 03:35:24 -0500 |
---|---|---|
committer | Mike Frysinger <vapier@google.com> | 2020-02-11 14:46:13 -0500 |
commit | 45d1c372a79fe35e1deb4956708432bc9ae80ea0 (patch) | |
tree | d7168ecff9277032f8fc3d53dbda0f6245754407 | |
parent | 19607b28172c3be8153fa0c44326052929fe8653 (diff) | |
download | git-repo-45d1c372a79fe35e1deb4956708432bc9ae80ea0.tar.gz |
project: fix bytes/str encoding when updating git submodules
Since tempfile.mkstemp() returns a file handle in binary mode,
make sure we turn our strings into bytes before writing.
Bug: https://crbug.com/gerrit/12043
Change-Id: I3e84d595e84b8bc12a1fbc7fd0bb3ea0ba2832b0
Reviewed-on: https://gerrit-review.googlesource.com/c/git-repo/+/254393
Reviewed-by: Michael Mortensen <mmortensen@google.com>
Reviewed-by: Mike Frysinger <vapier@google.com>
Tested-by: Mike Frysinger <vapier@google.com>
(cherry picked from commit 163d42eb43ba79677aae22fa859896010badba9b)
-rw-r--r-- | project.py | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -1989,7 +1989,7 @@ class Project(object): | |||
1989 | gitmodules_lines = [] | 1989 | gitmodules_lines = [] |
1990 | fd, temp_gitmodules_path = tempfile.mkstemp() | 1990 | fd, temp_gitmodules_path = tempfile.mkstemp() |
1991 | try: | 1991 | try: |
1992 | os.write(fd, p.stdout) | 1992 | os.write(fd, p.stdout.encode('utf-8')) |
1993 | os.close(fd) | 1993 | os.close(fd) |
1994 | cmd = ['config', '--file', temp_gitmodules_path, '--list'] | 1994 | cmd = ['config', '--file', temp_gitmodules_path, '--list'] |
1995 | p = GitCommand(None, cmd, capture_stdout=True, capture_stderr=True, | 1995 | p = GitCommand(None, cmd, capture_stdout=True, capture_stderr=True, |