android/git-repo
1
Fork 0
mirror of https://gerrit.googlesource.com/git-repo synced 2025-01-02 16:14:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix print of git-remote-persistent-https error

Browse Source 
If git-remote-persistent-https fails, we use an iter() and then
subsequently a .read() on stderr.  Python doesn't like this and
gives the following error message:
ValueError: Mixing iteration and read methods would lose data

This change removes the use of iter() to avoid the issue.

Change-Id: I980659b83229e2a559c20dcc7b116f8d2476abd5
This commit is contained in:
Conley Owens 2013-11-21 10:38:03 -08:00
parent d5a5b19efd
commit cbc0798f67
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
project.py
View File

@ -1840,11 +1840,11 @@ class Project(object):
cookiefile = line[len(prefix):] cookiefile = line[len(prefix):]
break break
if p.wait(): if p.wait():
line = iter(p.stderr).next() err_msg = p.stderr.read()
if ' -print_config' in line: if ' -print_config' in err_msg:
pass # Persistent proxy doesn't support -print_config. pass # Persistent proxy doesn't support -print_config.
else: else:
print(line + p.stderr.read(), file=sys.stderr) print(err_msg, file=sys.stderr)
if cookiefile: if cookiefile:
return cookiefile return cookiefile
except OSError as e: except OSError as e: