Unexpected system call errors don't cause rmdir'ing to fail

lib/paperclip/storage.rb

@@ -63,6 +63,9 @@ module Paperclip
             end
             end
           rescue Errno::ENOTEMPTY, Errno::ENOENT, Errno::EINVAL, Errno::ENOTDIR
           rescue Errno::ENOTEMPTY, Errno::ENOENT, Errno::EINVAL, Errno::ENOTDIR
             # Stop trying to remove parent directories
             # Stop trying to remove parent directories
+          rescue SystemCallError => e
+            logger.info("[paperclip] There was an unexpected error while deleting directories: #{e.class}")
+            # Ignore it
           end
           end
         end
         end
         @queued_for_delete = []
         @queued_for_delete = []

test/integration_test.rb

@@ -106,6 +106,10 @@ class IntegrationTest < Test::Unit::TestCase
           assert ! File.exists?(File.dirname(@saved_path))
           assert ! File.exists?(File.dirname(@saved_path))
           assert ! File.exists?(File.dirname(File.dirname(@saved_path)))
           assert ! File.exists?(File.dirname(File.dirname(@saved_path)))
         end
         end
+
+        before_should "not die if an unexpected SystemCallError happens" do
+          FileUtils.stubs(:rmdir).raises(Errno::EEXIST)
+        end
       end
       end
     end
     end
   end
   end