Merge lp:~jderose/filestore/lost+found into lp:filestore

[Jason Gerard DeRose]

This changes iter_files() to no longer descend into the "lost+found" directory on ext4/ext3/ext2 filesystems. So that a normal "lost+found" directory isn't skipped by mistake, the criteria is quite strict.

Tiny change, but unfortunately rather impossible to write unit tests for (as we need specific a *filesystem* in a known state).

However, I will add a test for this to our long running test hardness once it's ready.

=== modified file 'filestore.py'
--- filestore.py	2011-10-07 06:41:59 +0000
+++ filestore.py	2011-10-09 08:06:24 +0000
@@ -583,6 +583,9 @@
 ###########################################
 # High performance IO and batch operations:
 
+def _can_skip(st):
+    return st.st_uid == 0 and st.st_gid == 0 and stat.S_IMODE(st.st_mode) == 0o700
+
 def iter_files(basedir):
     """
     Recursively iterate through files in directory *basedir*.
@@ -602,6 +605,8 @@
         if stat.S_ISREG(st.st_mode):
             yield File(fullname, st.st_size, st.st_mtime)
         elif stat.S_ISDIR(st.st_mode):
+            if name == 'lost+found' and path.ismount(basedir) and _can_skip(st):
+                continue
             dirs.append(fullname)
     for fullname in dirs:
         for file in iter_files(fullname):