Merge lp:~jelmer/bzr/gpg-no-tty into lp:bzr/2.5

Proposed by Jelmer Vernooij on 2012-06-26
Status: Merged
Approved by: Martin Packman on 2012-06-27
Approved revision: 6504
Merged at revision: 6504
Proposed branch: lp:~jelmer/bzr/gpg-no-tty
Merge into: lp:bzr/2.5
Diff against target: 55 lines (+6/-4)
3 files modified
bzrlib/gpg.py (+1/-1)
bzrlib/tests/test_gpg.py (+3/-3)
doc/en/release-notes/bzr-2.5.txt (+2/-0)
To merge this branch: bzr merge lp:~jelmer/bzr/gpg-no-tty
Reviewer Review Type Date Requested Status
Martin Packman (community) 2012-06-26 Approve on 2012-06-27
Review via email: mp+112245@code.launchpad.net

Commit message

Revert patch to specify --no-tty argument to gpg.

Description of the change

Revert the use of --no-tty when signing using GPG.

See bug 1014570 for background.

To post a comment you must log in.
Martin Packman (gz) wrote :

Looks good, along with reopening the original bug to do something about the bzr explorer case.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'bzrlib/gpg.py'
2--- bzrlib/gpg.py 2012-02-27 20:16:25 +0000
3+++ bzrlib/gpg.py 2012-06-26 23:10:25 +0000
4@@ -190,7 +190,7 @@
5 # use the user email address
6 key = config.extract_email_address(self._config_stack.get('email'))
7 return [self._config_stack.get('gpg_signing_command'), '--clearsign',
8- '-u', key, '--no-tty']
9+ '-u', key]
10
11 def sign(self, content):
12 if isinstance(content, unicode):
13
14=== modified file 'bzrlib/tests/test_gpg.py'
15--- bzrlib/tests/test_gpg.py 2012-02-26 19:21:01 +0000
16+++ bzrlib/tests/test_gpg.py 2012-06-26 23:10:25 +0000
17@@ -51,7 +51,7 @@
18 self.my_gpg = gpg.GPGStrategy(FakeConfig())
19
20 def test_signing_command_line(self):
21- self.assertEqual(['false', '--clearsign', '-u', 'amy@example.com', '--no-tty'],
22+ self.assertEqual(['false', '--clearsign', '-u', 'amy@example.com'],
23 self.my_gpg._command_line())
24
25 def test_signing_command_line_from_default(self):
26@@ -60,7 +60,7 @@
27 email=Amy <amy@example.com>
28 gpg_signing_key=default
29 gpg_signing_command=false'''))
30- self.assertEqual(['false', '--clearsign', '-u', 'amy@example.com', '--no-tty'],
31+ self.assertEqual(['false', '--clearsign', '-u', 'amy@example.com'],
32 my_gpg._command_line())
33
34 def test_signing_command_line_from_email(self):
35@@ -68,7 +68,7 @@
36 my_gpg = gpg.GPGStrategy(FakeConfig('''
37 email=Amy <amy@example.com>
38 gpg_signing_command=false'''))
39- self.assertEqual(['false', '--clearsign', '-u', 'amy@example.com', '--no-tty'],
40+ self.assertEqual(['false', '--clearsign', '-u', 'amy@example.com'],
41 my_gpg._command_line())
42
43 def test_checks_return_code(self):
44
45=== modified file 'doc/en/release-notes/bzr-2.5.txt'
46--- doc/en/release-notes/bzr-2.5.txt 2012-05-22 15:28:45 +0000
47+++ doc/en/release-notes/bzr-2.5.txt 2012-06-26 23:10:25 +0000
48@@ -32,6 +32,8 @@
49 .. Fixes for situations where bzr would previously crash or give incorrect
50 or undesirable results.
51
52+* Revert use of --no-tty when gpg signing commits. (Jelmer Vernooij, #1014570)
53+
54 Documentation
55 *************
56

Subscribers

People subscribed via source and target branches