/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to breezy/merge_directive.py

  • Committer: Jelmer Vernooij
  • Date: 2018-03-24 17:48:04 UTC
  • mfrom: (6921 work)
  • mto: This revision was merged to the branch mainline in revision 6923.
  • Revision ID: jelmer@jelmer.uk-20180324174804-xf22o05byoj12x1q
Merge trunk.

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/merge_directive.py
251
251
        :return: a string
252
252
        """
253
253
        my_gpg = gpg.GPGStrategy(branch.get_config_stack())
254
 
        return my_gpg.sign(''.join(self.to_lines()))
 
254
        return my_gpg.sign(''.join(self.to_lines()), gpg.MODE_CLEAR)
255
255
 
256
256
    def to_email(self, mail_to, branch, sign=False):
257
257
        """Serialize as an email message.