@@ -61,7 +61,7 @@ module Paperclip 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}") lib/paperclip/storage.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 test/integration_test.rb 86d0ecdf7ccfd75aac77d69a57c1425205e1bf7a Jon Yurek jyurek@thoughtbot.com http://github.com/thoughtbot/paperclip/commit/54a18162974afd96295be29d9fabf542c74d4e93 54a18162974afd96295be29d9fabf542c74d4e93 2009-02-07T21:02:09-08:00 2009-02-07T21:02:09-08:00 Added Errno::EEXIST to the list of expected errors while deleting empty directories. bdea2e2ad3a2acee740e5b6177a71f11be73a40f Jon Yurek jyurek@thoughtbot.com