← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/gpg.py

  • Committer: John Arbash Meinel
  • Date: 2013-05-19 14:29:37 UTC
  • mfrom: (6437.63.9 2.5)
  • mto: (6437.63.10 2.5)
  • mto: This revision was merged to the branch mainline in revision 6575.
  • Revision ID: john@arbash-meinel.com-20130519142937-21ykz2n2y2f22za9
Merge in the actual 2.5 branch. It seems I failed before

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/gpg.py
190
190
            # use the user email address
191
191
            key = config.extract_email_address(self._config_stack.get('email'))
192
192
        return [self._config_stack.get('gpg_signing_command'), '--clearsign',
193
 
                '-u', key, '--no-tty']
 
193
                '-u', key]
194
194
 
195
195
    def sign(self, content):
196
196
        if isinstance(content, unicode):