1 files changed, 4 insertions, 4 deletions
diff --git a/repo b/repo
index 6f2067ea..02858ec2 100755
--- a/repo
+++ b/repo
@@ -259,8 +259,8 @@ def _SetupGnuPG(quiet):
            gpg_dir, e.strerror)
      sys.exit(1)
-  env = dict(os.environ)
+  env = os.environ.copy()
-  env['GNUPGHOME'] = gpg_dir
+  env['GNUPGHOME'] = gpg_dir.encode()
  cmd = ['gpg', '--import']
  try:
@@ -378,8 +378,8 @@ def _Verify(cwd, branch, quiet):
        % (branch, cur)
      print >>sys.stderr
-  env = dict(os.environ)
+  env = os.environ.copy()
-  env['GNUPGHOME'] = gpg_dir
+  env['GNUPGHOME'] = gpg_dir.encode()
  cmd = [GIT, 'tag', '-v', cur]
  proc = subprocess.Popen(cmd,

diff --git a/repo b/repo index 6f2067ea..02858ec2 100755 --- a/repo +++ b/repo
@@ -259,8 +259,8 @@ def _SetupGnuPG(quiet):
259	gpg_dir, e.strerror)	259	gpg_dir, e.strerror)
260	sys.exit(1)	260	sys.exit(1)
261		261
262	env = dict(os.environ)	262	env = os.environ.copy()
263	env['GNUPGHOME'] = gpg_dir	263	env['GNUPGHOME'] = gpg_dir.encode()
264		264
265	cmd = ['gpg', '--import']	265	cmd = ['gpg', '--import']
266	try:	266	try:
@@ -378,8 +378,8 @@ def _Verify(cwd, branch, quiet):
378	% (branch, cur)	378	% (branch, cur)
379	print >>sys.stderr	379	print >>sys.stderr
380		380
381	env = dict(os.environ)	381	env = os.environ.copy()
382	env['GNUPGHOME'] = gpg_dir	382	env['GNUPGHOME'] = gpg_dir.encode()
383		383
384	cmd = [GIT, 'tag', '-v', cur]	384	cmd = [GIT, 'tag', '-v', cur]
385	proc = subprocess.Popen(cmd,	385	proc = subprocess.Popen(cmd,