[MERGE] Emacs message mode as email client option

[Aaron Bentley]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Bojan Nikolic wrote:
> Thanks again, updated whitespace and NEWS as suggested. 

Thanks.

Unfortunately, this message contained your mail signature in the
attachment, which is a corruption, and actually causes a traceback.  I'm
not sure why your previous message didn't cause this problem, since I
see a signature there, too.

We should try to improve the robustness, but I don't think we can merge
your change until the signature is removed.  Sorry I missed this earlier.

Traceback follows.

Aaron

bzr: ERROR: binascii.Error: Incorrect padding

Traceback (most recent call last):
  File "/home/abentley/bzr/bzr.dev/bzrlib/commands.py", line 834, in
run_bzr_catch_errors
    return run_bzr(argv)
  File "/home/abentley/bzr/bzr.dev/bzrlib/commands.py", line 790, in run_bzr
    ret = run(*run_argv)
  File "/home/abentley/bzr/bzr.dev/bzrlib/commands.py", line 492, in
run_argv_aliases
    return self.run(**all_cmd_args)
  File "/home/abentley/bzr/bzr.dev/bzrlib/bundle/commands.py", line 58,
in run
    bundle_file = StringIO(bundle_info.get_raw_bundle())
  File "/home/abentley/bzr/bzr.dev/bzrlib/merge_directive.py", line 397,
in get_raw_bundle
    return self.bundle.decode('base-64')
  File "/usr/lib/python2.5/encodings/base64_codec.py", line 42, in
base64_decode
    output = base64.decodestring(input)
  File "/usr/lib/python2.5/base64.py", line 321, in decodestring
    return binascii.a2b_base64(s)
Error: Incorrect padding

bzr 1.4dev on python 2.5.2 (linux2)
arguments: ['/home/abentley/bin/bzr', 'bundle-info', 'emacs-mail.patch']
encoding: 'ANSI_X3.4-1968', fsenc: 'ANSI_X3.4-1968', lang: 'C'
plugins:
  automv               /home/abentley/.bazaar/plugins/automv [unknown]
  bzrtools             /home/abentley/.bazaar/plugins/bzrtools [1.3.0]
  docdiff              /home/abentley/.bazaar/plugins/docdiff [0.9.0]
  extmerge             /home/abentley/.bazaar/plugins/extmerge [unknown]
  gtk                  /home/abentley/.bazaar/plugins/gtk [0.94.0dev0]
  hax                  /home/abentley/.bazaar/plugins/hax [unknown]
  heads                /home/abentley/.bazaar/plugins/heads [unknown]
  launchpad
/home/abentley/bzr/bzr.dev/bzrlib/plugins/launchpad [unknown]
  loom                 /home/abentley/.bazaar/plugins/loom [1.3.0dev0]
  lpreview             /home/abentley/.bazaar/plugins/lpreview [unknown]
  mirror               /home/abentley/.bazaar/plugins/mirror [unknown]
  modlines             /home/abentley/.bazaar/plugins/modlines [unknown]
  pqm                  /home/abentley/.bazaar/plugins/pqm [1.0.0dev0]
  vimdiff              /home/abentley/.bazaar/plugins/vimdiff [unknown]
*** Bazaar has encountered an internal error.
    Please report a bug at https://bugs.launchpad.net/bzr/+filebug
    including this traceback, and a description of what you
    were doing when the error occurred.
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.6 (GNU/Linux)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org

iD8DBQFH6UU70F+nu1YWqI0RAnIWAJwPavdALgB8llHJvYskJXI/ARfaOQCfWo3F
Z0AoZs1wYC1ALwrNAUdGVgY=
=NFh7
-----END PGP SIGNATURE-----