mirror of
https://gerrit.googlesource.com/git-repo
synced 2024-12-21 07:16:21 +00:00
Merge "Support non-ASCII GNUPGHOME environment variable"
This commit is contained in:
commit
69297c1b77
10
repo
10
repo
@ -432,7 +432,10 @@ def SetupGnuPG(quiet):
|
||||
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 @@ def _Verify(cwd, branch, quiet):
|
||||
_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,
|
||||
|
Loading…
Reference in New Issue
Block a user