Rev 6040: Merge IWATA's fix for bug #827721, fix NEWS indentation. in http://bazaar.launchpad.net/~jameinel/bzr/integration

[John Arbash Meinel]

At http://bazaar.launchpad.net/~jameinel/bzr/integration

------------------------------------------------------------
revno: 6040 [merge]
revision-id: john at arbash-meinel.com-20110828112356-vkc5geipccgqykf8
parent: pqm at pqm.ubuntu.com-20110824141634-e0mk34gej3pitt54
parent: iwata0303 at gmail.com-20110827024033-ufdldy9hneoa8mrt
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: integration
timestamp: Sun 2011-08-28 13:23:56 +0200
message:
  Merge IWATA's fix for bug #827721, fix NEWS indentation.
modified:
  bzrlib/transport/__init__.py   transport.py-20050711165921-4978aa7ce1285ad5
  doc/en/release-notes/bzr-2.4.txt bzr2.4.txt-20110114053217-k7ym9jfz243fddjm-1
-------------- next part --------------
=== modified file 'bzrlib/transport/__init__.py'
--- a/bzrlib/transport/__init__.py	2011-07-27 05:05:15 +0000
+++ b/bzrlib/transport/__init__.py	2011-08-27 02:40:33 +0000
@@ -325,7 +325,7 @@
             if e.errno in (errno.ENOENT, errno.ENOTDIR):
                 raise errors.NoSuchFile(path, extra=e)
             elif e.errno == errno.EINVAL:
-                mutter("EINVAL returned on path %s: %s" % (path, e))
+                mutter("EINVAL returned on path %s: %r" % (path, e))
                 raise errors.NoSuchFile(path, extra=e)
             # I would rather use errno.EFOO, but there doesn't seem to be
             # any matching for 267

=== modified file 'doc/en/release-notes/bzr-2.4.txt'
--- a/doc/en/release-notes/bzr-2.4.txt	2011-08-24 08:02:23 +0000
+++ b/doc/en/release-notes/bzr-2.4.txt	2011-08-28 11:23:56 +0000
@@ -40,6 +40,9 @@
 
 * Fix i18n use when no environment variables are set. (Jelmer Vernooij, #810701)
 
+* Avoid UnicodeDecode error when reporting EINVAL from transports.
+  (IWATA Hidetaka, #829237)
+
 Documentation
 *************