Rev 4680: Clean up some terminology, catch a double _listdir request, thanks spiv. in http://bazaar.launchpad.net/~jameinel/bzr/2.0.1-322807-branch-at-root

[John Arbash Meinel]

At http://bazaar.launchpad.net/~jameinel/bzr/2.0.1-322807-branch-at-root

------------------------------------------------------------
revno: 4680
revision-id: john at arbash-meinel.com-20091008035530-xa6kmr9toz56i62x
parent: john at arbash-meinel.com-20091006173603-geynkwufk5orrap7
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: 2.0.1-322807-branch-at-root
timestamp: Wed 2009-10-07 22:55:30 -0500
message:
  Clean up some terminology, catch a double _listdir request, thanks spiv.
-------------- next part --------------
=== modified file 'bzrlib/osutils.py'
--- a/bzrlib/osutils.py	2009-10-06 17:36:03 +0000
+++ b/bzrlib/osutils.py	2009-10-08 03:55:30 +0000
@@ -1085,11 +1085,12 @@
         lbit = bit.lower()
         try:
             next_entries = _listdir(current)
-        except OSError: # enoent
-            # current doesn't match, so just append the non-existing bits
+        except OSError: # enoent, eperm, etc
+            # We can't find this in the filesystem, so just append the
+            # remaining bits.
             current = pathjoin(current, bit, *list(bit_iter))
             break
-        for look in _listdir(current):
+        for look in next_entries:
             if lbit == look.lower():
                 current = pathjoin(current, look)
                 break