commit 69297c1b771bbbd05b63e965a524de6860d15d8c
author David Pursehouse <dpursehouse@collab.net> Mon Aug 15 00:51:32 2016 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Mon Aug 15 00:51:32 2016 +0000
tree c9d7c7041ff71ca3cb12c6ee65cd72897bfb5dfd
parent 8016f60a46845fdadbadd88c5746cdaabe476417
parent 631d0ec708b5341ba02b821c120755fd814fbc0b

Merge "Support non-ASCII GNUPGHOME environment variable"

repo

diff --git a/repo b/repo
index e5cb890..ebd12c6 100755
--- a/repo
+++ b/repo
@@ -432,7 +432,10 @@
       sys.exit(1)
 
   env = os.environ.copy()
-  env['GNUPGHOME'] = gpg_dir.encode()
+  try:
+    env['GNUPGHOME'] = gpg_dir
+  except UnicodeEncodeError:
+    env['GNUPGHOME'] = gpg_dir.encode()
 
   cmd = ['gpg', '--import']
   try:
@@ -638,7 +641,10 @@
       _print(file=sys.stderr)
 
   env = os.environ.copy()
-  env['GNUPGHOME'] = gpg_dir.encode()
+  try:
+    env['GNUPGHOME'] = gpg_dir
+  except UnicodeEncodeError:
+    env['GNUPGHOME'] = gpg_dir.encode()
 
   cmd = [GIT, 'tag', '-v', cur]
   proc = subprocess.Popen(cmd,