Rev 6040: Bug #827721, OS/IOError will have locale dependent encoding, in file:///home/pqm/archives/thelove/bzr/2.4/

[Canonical.com Patch Queue Manager]

At file:///home/pqm/archives/thelove/bzr/2.4/

------------------------------------------------------------
revno: 6040 [merge]
revision-id: pqm at pqm.ubuntu.com-20110830094437-y5wu3f1jio1h70jo
parent: pqm at pqm.ubuntu.com-20110824141634-e0mk34gej3pitt54
parent: mbp at canonical.com-20110830072716-u3eab6p5hvpbmp8g
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: 2.4
timestamp: Tue 2011-08-30 09:44:37 +0000
message:
  Bug #827721, OS/IOError will have locale dependent encoding,
   so use %r rather than %s.
modified:
  bzrlib/transport/__init__.py   transport.py-20050711165921-4978aa7ce1285ad5
  doc/en/release-notes/bzr-2.4.txt bzr2.4.txt-20110114053217-k7ym9jfz243fddjm-1
=== 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-30 07:27:16 +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
 *************