From: Zac Medico <zmedico@gentoo.org>
Date: Sat, 27 Jul 2013 22:28:40 +0000 (-0700)
Subject: repoman: export GPG_TTY for bug #477728
X-Git-Tag: v2.2.0_alpha191~9
X-Git-Url: http://git.tremily.us/?p=portage.git;a=commitdiff_plain;h=af76565d011464a6da418478655848182099e117

repoman: export GPG_TTY for bug #477728
---

diff --git a/bin/repoman b/bin/repoman
index bbade9511..522343980 100755
--- a/bin/repoman
+++ b/bin/repoman
@@ -638,6 +638,12 @@ if repo_config.sign_commit:
 			# Pass GNUPGHOME to git for bug #462362.
 			commit_env["GNUPGHOME"] = repoman_settings["PORTAGE_GPG_DIR"]
 
+		# Pass GPG_TTY to git for bug #477728.
+		try:
+			commit_env["GPG_TTY"] = os.ttyname(sys.stdin.fileno())
+		except OSError:
+			pass
+
 # In order to disable manifest signatures, repos may set
 # "sign-manifests = false" in metadata/layout.conf. This
 # can be used to prevent merge conflicts like those that