Added Errno::EEXIST to the list of expected errors while deleting emp…

…ty directories.

lib/paperclip/storage.rb

@@ -61,7 +61,7 @@ def flush_deletes #:nodoc:
               path = File.dirname(path)
               FileUtils.rmdir(path)
             end
-          rescue Errno::ENOTEMPTY, Errno::ENOENT, Errno::EINVAL, Errno::ENOTDIR
+          rescue Errno::EEXIST, Errno::ENOTEMPTY, Errno::ENOENT, Errno::EINVAL, Errno::ENOTDIR
             # Stop trying to remove parent directories
           rescue SystemCallError => e
             logger.info("[paperclip] There was an unexpected error while deleting directories: #{e.class}")

test/integration_test.rb

@@ -108,7 +108,7 @@ class IntegrationTest < Test::Unit::TestCase
         end
 
         before_should "not die if an unexpected SystemCallError happens" do
-          FileUtils.stubs(:rmdir).raises(Errno::EEXIST)
+          FileUtils.stubs(:rmdir).raises(Errno::EPIPE)
         end
       end
     end