Quellcode durchsuchen

Fix print of git-remote-persistent-https error

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
Conley Owens vor 12 Jahren
Ursprung
Commit
cbc0798f67
1 geänderte Dateien mit 3 neuen und 3 gelöschten Zeilen
  1. 3 3
      project.py

+ 3 - 3
project.py

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