Merge lp:~hid-iwata/bzr/fix-827721 into lp:bzr/2.4

[IWATA Hidetaka]

Bug #827721, OS/IOError will have locale dependent encoding, so use %r rather than %s.

Fix for #827721
Avoid UnicodeError when EINVAL error occurred.

[Martin Packman (gz)]

Thanks for finishing this off!

For this change it may not matter, but if you haven't done the contributor agreement yet, now would be a good time:
<http://www.canonical.com/contributors>

review: Approve

[John A Meinel (jameinel)]

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

On 8/27/2011 4:50 AM, IWATA Hidetaka wrote:
> IWATA Hidetaka has proposed merging lp:~hid-iwata/bzr/fix-827721
> into lp:bzr/2.4.
>
> Requested reviews: bzr-core (bzr-core) Related bugs: Bug #827721 in
> Bazaar: "bzr explorer can't open repository (bzr can't handle
> EINVAL error)" https://bugs.launchpad.net/bzr/+bug/827721
>
> For more details, see:
> https://code.launchpad.net/~hid-iwata/bzr/fix-827721/+merge/73125
>
> Fix for #827721 Avoid UnicodeError when EINVAL error occurred.

 merge: approve

This counts as a trivial change, but it would be nice to have you sign
the contributor agreement anyway.

John
=:->

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (Cygwin)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org/

iEYEARECAAYFAk5aA4oACgkQJdeBCYSNAAMzgACeKZpmgf1oyeQrS+ZaW6eONbG2
+NIAnRAbZ0AwycrZmERZK8cKhaXwHkti
=U8Wz
-----END PGP SIGNATURE-----

review: Approve

[John A Meinel (jameinel)]

sent to pqm by email

[John A Meinel (jameinel)]

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

On 8/27/2011 4:50 AM, IWATA Hidetaka wrote:
> IWATA Hidetaka has proposed merging lp:~hid-iwata/bzr/fix-827721
> into lp:bzr/2.4.
>
> Requested reviews: bzr-core (bzr-core) Related bugs: Bug #827721 in
> Bazaar: "bzr explorer can't open repository (bzr can't handle
> EINVAL error)" https://bugs.launchpad.net/bzr/+bug/827721
>
> For more details, see:
> https://code.launchpad.net/~hid-iwata/bzr/fix-827721/+merge/73125
>
> Fix for #827721 Avoid UnicodeError when EINVAL error occurred.

This failed in PQM because:
+* Avoid UnicodeDecode error when reporting EINVAL from transports.
+ (IWATA Hidetaka, #829237)
+

  ^- This has 1 space indent, instead of two, it should be:
+* Avoid UnicodeDecode error when reporting EINVAL from transports.
+ (IWATA Hidetaka, #829237)
+

I'll do a quick fixup and resubmit.

John
=:->
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (Cygwin)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org/

iEYEARECAAYFAk5aJMoACgkQJdeBCYSNAANuZQCePq4mCLF7mfVGaDMLmY45FyjR
dSsAmwUa7UEL+4zmKHdT1yPjyz6NMjs8
=gS1b
-----END PGP SIGNATURE-----

[John A Meinel (jameinel)]

sent to pqm by email (from my branch)

[Martin Packman (gz)]

You landed on dev not 2.4 John? This needs to be on 2.4 too.

[IWATA Hidetaka (hid-iwata)]

> For this change it may not matter, but if you haven't done the contributor agreement yet, now would be a good time:
> <http://www.canonical.com/contributors>

OK. I'll do it.
But I need some more time because I have no printer and scanner :-(

[Martin Pool (mbp)]

sent to pqm by email

[Martin Pool (mbp)]

We don't need assignment for this; it's trivial. (Previously we didn't have a 'trivial' category but now we do.)

[Martin Pool (mbp)]

this failed in pqm, apparently while generating the news. the filename in the error is a bit surprising, but the rest error is clear. i'll fix it up.

I: [pqm-bzr-amd64-lucid chroot] Running command: "cd /home/pqm/bzr-pqm-workdir/home/2.4 && LANG=en_GB.utf8 make check"
doc/en/release-notes/NEWS.txt:50: (WARNING/2) Bullet list ends without a blank line; unexpected unindent.
Exiting due to level-2 (WARNING) system message.
make: *** [doc/en/release-notes/NEWS.html] Error 1

[John A Meinel (jameinel)]

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

On 8/28/2011 11:51 PM, Martin [gz] wrote:
> You landed on dev not 2.4 John? This needs to be on 2.4 too.

Martin Pool submitted it to 2.4 for me, currently in pqm.

John
=:->

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (Cygwin)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org/

iEYEARECAAYFAk5cpD0ACgkQJdeBCYSNAAOf9wCdFN6mtMu5OyMiiUmD9bUIVESg
tFoAn385+mLKP75C5QFflvMmVWx58iCU
=2bqm
-----END PGP SIGNATURE-----

=== modified file 'bzrlib/transport/__init__.py'
--- bzrlib/transport/__init__.py	2011-07-27 05:05:15 +0000
+++ bzrlib/transport/__init__.py	2011-08-27 02:47:54 +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'
--- doc/en/release-notes/bzr-2.4.txt	2011-08-24 08:02:23 +0000
+++ doc/en/release-notes/bzr-2.4.txt	2011-08-27 02:47:54 +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
 *************