Merge branch 'bug/lstat-removed-file' into merge

blankdd · Jan 9, 2014 · 5d11d99 · 5d11d99
2 parents cecb9e2 + cd90d1f
commit 5d11d99
Showing 1 changed file with 9 additions and 1 deletion.
diff --git a/S3/FileLists.py b/S3/FileLists.py
@@ -18,6 +18,7 @@
 import glob
 import copy
 import re
+import errno
 
 __all__ = ["fetch_local_list", "fetch_remote_list", "compare_filelists", "filter_exclude_include"]
 
@@ -226,7 +227,14 @@ def _get_filelist_local(loc_list, local_uri, cache):
                     relative_file = replace_nonprintables(relative_file)
                 if relative_file.startswith('./'):
                     relative_file = relative_file[2:]
-                sr = os.stat_result(os.lstat(full_name))
+                try:
+                    sr = os.stat_result(os.lstat(full_name))
+                except OSError, e:
+                    if e.errno == errno.ENOENT:
+                        # file was removed async to us getting the list
+                        continue
+                    else:
+                        raise
                 loc_list[relative_file] = {
                     'full_name_unicode' : unicodise(full_name),
                     'full_name' : full_name,