Rev 3708: Fix PQM test failure. in http://people.ubuntu.com/~robertc/baz2.0/integration

[Robert Collins]

At http://people.ubuntu.com/~robertc/baz2.0/integration

------------------------------------------------------------
revno: 3708
revision-id: robertc at robertcollins.net-20080924011138-rwb2ywh8xnzjzuoq
parent: robertc at robertcollins.net-20080924000949-vigmjnpor0w5kpxz
committer: Robert Collins <robertc at robertcollins.net>
branch nick: integration
timestamp: Wed 2008-09-24 11:11:38 +1000
message:
  Fix PQM test failure.
modified:
  bzrlib/osutils.py              osutils.py-20050309040759-eeaff12fbf77ac86
=== modified file 'bzrlib/osutils.py'
--- a/bzrlib/osutils.py	2008-09-23 23:28:27 +0000
+++ b/bzrlib/osutils.py	2008-09-24 01:11:38 +0000
@@ -1324,7 +1324,11 @@
         dirblock = []
         append = dirblock.append
         for name in sorted(_listdir(top)):
-            name_utf8 = _utf8_encode(name)[0]
+            try:
+                name_utf8 = _utf8_encode(name)[0]
+            except UnicodeDecodeError:
+                raise errors.BadFilenameEncoding(
+                    _utf8_encode(relprefix)[0] + name, _fs_enc)
             abspath = top_slash + name
             statvalue = _lstat(abspath)
             kind = _kind_from_mode(statvalue.st_mode)