[Pkg-bazaar-maint] Bug#673484: bzr: Unable to sign commits: "no terminal at all requested"

[Gunnar Wolf]

tags 673484 + patch
thanks

This bug has been confirmed and patched¹ in Ubuntu's version
2.5.1-0ubuntu2; I have copied over Ubuntu's patch
(debian/patches/07_revert_no_tty), applied to the version currently in
Sid (2.6.0~bzr6526-1), and ran "quilt refresh" on it; I am attaching
the patch here. The patch appears to have been included upstream at
the 2.6.0~beta2 version, according to the latest Ubuntu changelog²,
but it seems to be after the 2.6.0~bzr6526 version we are carrying.

The patch is very easy and non-invasive; I applied it and attempted to
rebuild the package, but after >15 minutes, the build failed during
the tests (on a test that seems completely unrelated to said changes —
bzrlib.tests.per_workingtree.test_eol_conversion.TestEolConversion.test_eol_crlf_dirty)
I am not familiar with the package, but just hand-patching
/usr/share/pyshared/bzrlib/gpg.py with the first hunk of the patch
made it work again.

Please consider uploading a fixed version (and requeting the Release
Team to include it in Wheezy), as having the commits signed is an
important feature for many, and we will be regressing on it otherwise.

Thanks,

¹ https://bugs.launchpad.net/bzr/+bug/1014570

² https://launchpad.net/ubuntu/+source/bzr/2.6.0~beta2-0ubuntu1
-------------- next part --------------
Description: Revert use of --no-tty when GPG signing commits.
Origin: commit, revision id: jelmer at samba.org-20120626230430-eka8zo5476h8k12s
Author: Jelmer Vernooij <jelmer at samba.org>
Bug: https://launchpad.net/bugs/1014570
Last-Update: 2012-06-26
Applied-Upstream: yes
X-Bzr-Revision-Id: jelmer at samba.org-20120626230430-eka8zo5476h8k12s

=== modified file 'bzrlib/gpg.py'
Index: bzr-2.6.0~bzr6526/bzrlib/gpg.py
===================================================================
--- bzr-2.6.0~bzr6526.orig/bzrlib/gpg.py	2012-03-12 06:35:59.000000000 -0600
+++ bzr-2.6.0~bzr6526/bzrlib/gpg.py	2012-08-02 12:52:43.000000000 -0500
@@ -213,7 +213,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, '--no-tty']
+                '-u', key]
 
     def sign(self, content):
         if isinstance(content, unicode):
Index: bzr-2.6.0~bzr6526/bzrlib/tests/test_gpg.py
===================================================================
--- bzr-2.6.0~bzr6526.orig/bzrlib/tests/test_gpg.py	2012-02-26 13:21:01.000000000 -0600
+++ bzr-2.6.0~bzr6526/bzrlib/tests/test_gpg.py	2012-08-02 12:52:43.000000000 -0500
@@ -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', '--no-tty'],
+        self.assertEqual(['false',  '--clearsign', '-u', 'amy at example.com'],
                          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', '--no-tty'],
+        self.assertEqual(['false',  '--clearsign', '-u', 'amy at example.com'],
                          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', '--no-tty'],
+        self.assertEqual(['false',  '--clearsign', '-u', 'amy at example.com'],
                          my_gpg._command_line())
 
     def test_checks_return_code(self):
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 836 bytes
Desc: Digital signature
URL: <http://lists.alioth.debian.org/pipermail/pkg-bazaar-maint/attachments/20120802/02d9e12a/attachment.pgp>