summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rwxr-xr-xrepo11
1 files changed, 6 insertions, 5 deletions
diff --git a/repo b/repo
index e7379956..0888e44b 100755
--- a/repo
+++ b/repo
@@ -505,7 +505,7 @@ def SetupGnuPG(quiet):
505 print(file=sys.stderr) 505 print(file=sys.stderr)
506 return False 506 return False
507 507
508 proc.stdin.write(MAINTAINER_KEYS) 508 proc.stdin.write(MAINTAINER_KEYS.encode('utf-8'))
509 proc.stdin.close() 509 proc.stdin.close()
510 510
511 if proc.wait() != 0: 511 if proc.wait() != 0:
@@ -584,6 +584,7 @@ def _DownloadBundle(url, local, quiet):
584 cwd=local, 584 cwd=local,
585 stdout=subprocess.PIPE) 585 stdout=subprocess.PIPE)
586 for line in proc.stdout: 586 for line in proc.stdout:
587 line = line.decode('utf-8')
587 m = re.compile(r'^url\.(.*)\.insteadof (.*)$').match(line) 588 m = re.compile(r'^url\.(.*)\.insteadof (.*)$').match(line)
588 if m: 589 if m:
589 new_url = m.group(1) 590 new_url = m.group(1)
@@ -676,7 +677,7 @@ def _Verify(cwd, branch, quiet):
676 stdout=subprocess.PIPE, 677 stdout=subprocess.PIPE,
677 stderr=subprocess.PIPE, 678 stderr=subprocess.PIPE,
678 cwd=cwd) 679 cwd=cwd)
679 cur = proc.stdout.read().strip() 680 cur = proc.stdout.read().strip().decode('utf-8')
680 proc.stdout.close() 681 proc.stdout.close()
681 682
682 proc.stderr.read() 683 proc.stderr.read()
@@ -708,10 +709,10 @@ def _Verify(cwd, branch, quiet):
708 stderr=subprocess.PIPE, 709 stderr=subprocess.PIPE,
709 cwd=cwd, 710 cwd=cwd,
710 env=env) 711 env=env)
711 out = proc.stdout.read() 712 out = proc.stdout.read().decode('utf-8')
712 proc.stdout.close() 713 proc.stdout.close()
713 714
714 err = proc.stderr.read() 715 err = proc.stderr.read().decode('utf-8')
715 proc.stderr.close() 716 proc.stderr.close()
716 717
717 if proc.wait() != 0: 718 if proc.wait() != 0:
@@ -861,7 +862,7 @@ def _SetDefaultsTo(gitdir):
861 'HEAD'], 862 'HEAD'],
862 stdout=subprocess.PIPE, 863 stdout=subprocess.PIPE,
863 stderr=subprocess.PIPE) 864 stderr=subprocess.PIPE)
864 REPO_REV = proc.stdout.read().strip() 865 REPO_REV = proc.stdout.read().strip().decode('utf-8')
865 proc.stdout.close() 866 proc.stdout.close()
866 867
867 proc.stderr.read() 868 proc.stderr.read()