← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/gpg.py

  • Committer: Patch Queue Manager
  • Date: 2012-07-05 14:26:42 UTC
  • mfrom: (6531.1.1 merge-2.5)
  • Revision ID: pqm@pqm.ubuntu.com-20120705142642-iacrlxz8rnyti9zh
(jameinel) Merge the 2.5 branch. (Jelmer Vernooij)

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/gpg.py
213
213
            # use the user email address
214
214
            key = config.extract_email_address(self._config_stack.get('email'))
215
215
        return [self._config_stack.get('gpg_signing_command'), '--clearsign',
216
 
                '-u', key, '--no-tty']
 
216
                '-u', key]
217
217
 
218
218
    def sign(self, content):
219
219
        if isinstance(content, unicode):