commit 631d0ec708b5341ba02b821c120755fd814fbc0b
author Dāvis Mosāns <davispuh@gmail.com> Sat Jul 16 21:11:11 2016 +0300
committer Dāvis Mosāns <davispuh@gmail.com> Sat Jul 16 22:10:06 2016 +0300
tree 53c234d1a176959e0e0cfc13ffca44d8a636e6a4
parent f97e72e5ddfcd34400aba384775b793170044f5c

Support non-ASCII GNUPGHOME environment variable

Here we don't need to encode this gpg_dir string when using
Python 2.7 on Linux.

Change-Id: I56724e9511d3b1aea61535e654a45c212130630d

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,