Rev 6484: (mbp) Pass --no-tty to gpg when running it from a subprocess in bzr (Mark in file:///srv/pqm.bazaar-vcs.org/archives/thelove/bzr/2.5/

[Patch Queue Manager]

At file:///srv/pqm.bazaar-vcs.org/archives/thelove/bzr/2.5/

------------------------------------------------------------
revno: 6484 [merge]
revision-id: pqm at pqm.ubuntu.com-20120227221618-wziii23dypyqal4k
parent: pqm at pqm.ubuntu.com-20120227161913-pfpem5e6nop05m6d
parent: markgrandi at gmail.com-20120227201625-sthbxu6a51j7pacu
committer: Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: 2.5
timestamp: Mon 2012-02-27 22:16:18 +0000
message:
  (mbp) Pass --no-tty to gpg when running it from a subprocess in bzr (Mark
   Grandi)
modified:
  bzrlib/gpg.py                  gpg.py-20051017065112-8654536d415dacc6
  bzrlib/tests/test_gpg.py       testgpg.py-20051017042228-9276cd40a784c93c
  doc/en/release-notes/bzr-2.5.txt bzr2.5.txt-20110708125756-587p0hpw7oke4h05-1
=== modified file 'bzrlib/gpg.py'
--- a/bzrlib/gpg.py	2011-12-19 13:23:58 +0000
+++ b/bzrlib/gpg.py	2012-02-27 20:16:25 +0000
@@ -190,7 +190,7 @@
             # use the user email address
             key = config.extract_email_address(self._config_stack.get('email'))
         return [self._config_stack.get('gpg_signing_command'), '--clearsign',
-                '-u', key]
+                '-u', key, '--no-tty']
 
     def sign(self, content):
         if isinstance(content, unicode):

=== modified file 'bzrlib/tests/test_gpg.py'
--- a/bzrlib/tests/test_gpg.py	2011-12-21 14:25:26 +0000
+++ b/bzrlib/tests/test_gpg.py	2012-02-26 19:21:01 +0000
@@ -51,7 +51,7 @@
         self.my_gpg = gpg.GPGStrategy(FakeConfig())
 
     def test_signing_command_line(self):
-        self.assertEqual(['false',  '--clearsign', '-u', 'amy at example.com'],
+        self.assertEqual(['false',  '--clearsign', '-u', 'amy at example.com', '--no-tty'],
                          self.my_gpg._command_line())
 
     def test_signing_command_line_from_default(self):
@@ -60,7 +60,7 @@
 email=Amy <amy at example.com>
 gpg_signing_key=default
 gpg_signing_command=false'''))
-        self.assertEqual(['false',  '--clearsign', '-u', 'amy at example.com'],
+        self.assertEqual(['false',  '--clearsign', '-u', 'amy at example.com', '--no-tty'],
                          my_gpg._command_line())
 
     def test_signing_command_line_from_email(self):
@@ -68,7 +68,7 @@
         my_gpg = gpg.GPGStrategy(FakeConfig('''
 email=Amy <amy at example.com>
 gpg_signing_command=false'''))
-        self.assertEqual(['false',  '--clearsign', '-u', 'amy at example.com'],
+        self.assertEqual(['false',  '--clearsign', '-u', 'amy at example.com', '--no-tty'],
                          my_gpg._command_line())
 
     def test_checks_return_code(self):

=== modified file 'doc/en/release-notes/bzr-2.5.txt'
--- a/doc/en/release-notes/bzr-2.5.txt	2012-02-24 12:15:02 +0000
+++ b/doc/en/release-notes/bzr-2.5.txt	2012-02-26 19:21:01 +0000
@@ -1072,6 +1072,9 @@
   operations that use it, like merge, can now create trees without a root.
   (Aaron Bentley)
 
+* Fixed problem with getting errors about failing to open /dev/tty when using
+  Bazaar Explorer to sign commits. (Mark Grandi, #847388)
+
 Documentation
 *************