Rev 6107: (jameinel) Bug #827721, OS/IOError will have locale dependent encoding, in file:///home/pqm/archives/thelove/bzr/%2Btrunk/
Canonical.com Patch Queue Manager
pqm at pqm.ubuntu.com
Sun Aug 28 15:33:28 UTC 2011
At file:///home/pqm/archives/thelove/bzr/%2Btrunk/
------------------------------------------------------------
revno: 6107 [merge]
revision-id: pqm at pqm.ubuntu.com-20110828153321-knbejjeq0mrkjyp9
parent: pqm at pqm.ubuntu.com-20110828111318-tzo1k47rlx1xzxz9
parent: john at arbash-meinel.com-20110828112356-vkc5geipccgqykf8
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Sun 2011-08-28 15:33:21 +0000
message:
(jameinel) Bug #827721, OS/IOError will have locale dependent encoding,
so %r rather than %s. (IWATA Hidetaka)
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-08-12 15:34:53 +0000
+++ b/bzrlib/transport/__init__.py 2011-08-28 15:33:21 +0000
@@ -322,7 +322,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-25 10:33:14 +0000
+++ b/doc/en/release-notes/bzr-2.4.txt 2011-08-28 15:33:21 +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
*************
More information about the bazaar-commits
mailing list