|
 |
689774 |
Index: bzr-2.5.1/bzrlib/gpg.py
|
|
|
689774 |
===================================================================
|
|
|
689774 |
--- bzr-2.5.1.orig/bzrlib/gpg.py
|
|
|
689774 |
+++ bzr-2.5.1/bzrlib/gpg.py
|
|
|
689774 |
@@ -190,7 +190,7 @@ class GPGStrategy(object):
|
|
|
689774 |
# use the user email address
|
|
|
689774 |
key = config.extract_email_address(self._config_stack.get('email'))
|
|
|
689774 |
return [self._config_stack.get('gpg_signing_command'), '--clearsign',
|
|
|
689774 |
- '-u', key, '--no-tty']
|
|
|
689774 |
+ '-u', key]
|
|
|
689774 |
|
|
|
689774 |
def sign(self, content):
|
|
|
689774 |
if isinstance(content, unicode):
|
|
|
689774 |
Index: bzr-2.5.1/bzrlib/tests/test_gpg.py
|
|
|
689774 |
===================================================================
|
|
|
689774 |
--- bzr-2.5.1.orig/bzrlib/tests/test_gpg.py
|
|
|
689774 |
+++ bzr-2.5.1/bzrlib/tests/test_gpg.py
|
|
|
689774 |
@@ -51,7 +51,7 @@ class TestCommandLine(tests.TestCase):
|
|
|
689774 |
self.my_gpg = gpg.GPGStrategy(FakeConfig())
|
|
|
689774 |
|
|
|
689774 |
def test_signing_command_line(self):
|
|
|
689774 |
- self.assertEqual(['false', '--clearsign', '-u', 'amy@example.com', '--no-tty'],
|
|
|
689774 |
+ self.assertEqual(['false', '--clearsign', '-u', 'amy@example.com'],
|
|
|
689774 |
self.my_gpg._command_line())
|
|
|
689774 |
|
|
|
689774 |
def test_signing_command_line_from_default(self):
|
|
|
689774 |
@@ -60,7 +60,7 @@ class TestCommandLine(tests.TestCase):
|
|
|
689774 |
email=Amy <amy@example.com>
|
|
|
689774 |
gpg_signing_key=default
|
|
|
689774 |
gpg_signing_command=false'''))
|
|
|
689774 |
- self.assertEqual(['false', '--clearsign', '-u', 'amy@example.com', '--no-tty'],
|
|
|
689774 |
+ self.assertEqual(['false', '--clearsign', '-u', 'amy@example.com'],
|
|
|
689774 |
my_gpg._command_line())
|
|
|
689774 |
|
|
|
689774 |
def test_signing_command_line_from_email(self):
|
|
|
689774 |
@@ -68,7 +68,7 @@ gpg_signing_command=false'''))
|
|
|
689774 |
my_gpg = gpg.GPGStrategy(FakeConfig('''
|
|
|
689774 |
email=Amy <amy@example.com>
|
|
|
689774 |
gpg_signing_command=false'''))
|
|
|
689774 |
- self.assertEqual(['false', '--clearsign', '-u', 'amy@example.com', '--no-tty'],
|
|
|
689774 |
+ self.assertEqual(['false', '--clearsign', '-u', 'amy@example.com'],
|
|
|
689774 |
my_gpg._command_line())
|
|
|
689774 |
|
|
|
689774 |
def test_checks_return_code(self):
|