Rev 3768: (mbp) Don't treat ENOENT from readdir as indicating end-of-directory in file:///home/pqm/archives/thelove/bzr/%2Btrunk/

[Canonical.com Patch Queue Manager]

At file:///home/pqm/archives/thelove/bzr/%2Btrunk/

------------------------------------------------------------
revno: 3768
revision-id: pqm at pqm.ubuntu.com-20081007083316-c4x5b3os195vdrbu
parent: pqm at pqm.ubuntu.com-20081007063815-40cch4v8h4jcpw33
parent: mbp at sourcefrog.net-20081007051400-ajhh7gj41i9iwr7z
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Tue 2008-10-07 09:33:16 +0100
message:
  (mbp) Don't treat ENOENT from readdir as indicating end-of-directory
modified:
  bzrlib/_readdir_pyx.pyx        readdir.pyx-20060609152855-rm6v321vuaqyh9tu-1
    ------------------------------------------------------------
    revno: 3766.2.1
    revision-id: mbp at sourcefrog.net-20081007051400-ajhh7gj41i9iwr7z
    parent: mbp at sourcefrog.net-20081007044123-cxtrb7yfwutjyagu
    committer: Martin Pool <mbp at sourcefrog.net>
    branch nick: readdir-enoent
    timestamp: Tue 2008-10-07 16:14:00 +1100
    message:
      Don't treat ENOENT from readdir as indicating end-of-directory
    modified:
      bzrlib/_readdir_pyx.pyx        readdir.pyx-20060609152855-rm6v321vuaqyh9tu-1
=== modified file 'bzrlib/_readdir_pyx.pyx'
--- a/bzrlib/_readdir_pyx.pyx	2008-10-07 06:02:24 +0000
+++ b/bzrlib/_readdir_pyx.pyx	2008-10-07 08:33:16 +0000
@@ -304,15 +304,10 @@
                 else:
                     break
             if entry == NULL:
-                if errno == ENOTDIR or errno == ENOENT or errno == 0:
+                if errno == ENOTDIR or errno == 0:
                     # We see ENOTDIR at the end of a normal directory.
                     # As ENOTDIR for read_dir(file) is triggered on opendir,
                     # we consider ENOTDIR to be 'no error'.
-                    #
-                    # XXX: ENOENT is listed as 'invalid position in the dir stream' for
-                    # readdir.  It's not clear what we should do about that
-                    # case; at the moment we treat it as the end of the
-                    # directory.
                     continue
                 else:
                     raise OSError(errno, strerror(errno))