← Back to branch summary

~bzr/ubuntu/maverick/bzr/beta-ppa

« back to all changes in this revision

Viewing changes to debian/patches/07_revert_no_tty

Merge from main PPA.

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/07_revert_no_tty
 
1
Description: Revert use of --no-tty when GPG signing commits.
 
2
Origin: commit, revision id: jelmer@samba.org-20120626230430-eka8zo5476h8k12s
 
3
Author: Jelmer Vernooij <jelmer@samba.org>
 
4
Bug: https://launchpad.net/bugs/1014570
 
5
Last-Update: 2012-06-26
 
6
Applied-Upstream: yes
 
7
X-Bzr-Revision-Id: jelmer@samba.org-20120626230430-eka8zo5476h8k12s
 
8
 
 
9
=== modified file 'bzrlib/gpg.py'
 
10
--- old/bzrlib/gpg.py   2012-02-27 20:16:25 +0000
 
11
+++ new/bzrlib/gpg.py   2012-06-26 23:04:30 +0000
 
12
@@ -190,7 +190,7 @@
 
13
             # use the user email address
 
14
             key = config.extract_email_address(self._config_stack.get('email'))
 
15
         return [self._config_stack.get('gpg_signing_command'), '--clearsign',
 
16
-                '-u', key, '--no-tty']
 
17
+                '-u', key]
 
18
 
 
19
     def sign(self, content):
 
20
         if isinstance(content, unicode):
 
21
 
 
22
=== modified file 'bzrlib/tests/test_gpg.py'
 
23
--- old/bzrlib/tests/test_gpg.py        2012-02-26 19:21:01 +0000
 
24
+++ new/bzrlib/tests/test_gpg.py        2012-06-26 23:04:30 +0000
 
25
@@ -51,7 +51,7 @@
 
26
         self.my_gpg = gpg.GPGStrategy(FakeConfig())
 
27
 
 
28
     def test_signing_command_line(self):
 
29
-        self.assertEqual(['false',  '--clearsign', '-u', 'amy@example.com', '--no-tty'],
 
30
+        self.assertEqual(['false',  '--clearsign', '-u', 'amy@example.com'],
 
31
                          self.my_gpg._command_line())
 
32
 
 
33
     def test_signing_command_line_from_default(self):
 
34
@@ -60,7 +60,7 @@
 
35
 email=Amy <amy@example.com>
 
36
 gpg_signing_key=default
 
37
 gpg_signing_command=false'''))
 
38
-        self.assertEqual(['false',  '--clearsign', '-u', 'amy@example.com', '--no-tty'],
 
39
+        self.assertEqual(['false',  '--clearsign', '-u', 'amy@example.com'],
 
40
                          my_gpg._command_line())
 
41
 
 
42
     def test_signing_command_line_from_email(self):
 
43
@@ -68,7 +68,7 @@
 
44
         my_gpg = gpg.GPGStrategy(FakeConfig('''
 
45
 email=Amy <amy@example.com>
 
46
 gpg_signing_command=false'''))
 
47
-        self.assertEqual(['false',  '--clearsign', '-u', 'amy@example.com', '--no-tty'],
 
48
+        self.assertEqual(['false',  '--clearsign', '-u', 'amy@example.com'],
 
49
                          my_gpg._command_line())
 
50
 
 
51
     def test_checks_return_code(self):
 
52