Add actual IM error to output when failing to process

carrierwaveuploader · Mar 21, 2024 · b36b408 · b36b408
1 parent 5316b35
commit b36b408
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/lib/carrierwave/processing/mini_magick.rb b/lib/carrierwave/processing/mini_magick.rb
@@ -266,7 +266,7 @@ def manipulate!
     rescue ::MiniMagick::Error, ::MiniMagick::Invalid => e
       raise e if e.message =~ /(You must have .+ installed|is not installed|executable not found)/
       message = I18n.translate(:"errors.messages.processing_error")
-      raise CarrierWave::ProcessingError, message
+      raise CarrierWave::ProcessingError, "#{message}: #{e.message}"
     ensure
       image.destroy! if image
     end
@@ -313,7 +313,7 @@ def minimagick!(block = nil)
     rescue ::MiniMagick::Error, ::MiniMagick::Invalid => e
       raise e if e.message =~ /(You must have .+ installed|is not installed|executable not found)/
       message = I18n.translate(:"errors.messages.processing_error")
-      raise CarrierWave::ProcessingError, message
+      raise CarrierWave::ProcessingError, "#{message}: #{e.message}"
     end
 
   private

diff --git a/lib/carrierwave/processing/rmagick.rb b/lib/carrierwave/processing/rmagick.rb
@@ -366,8 +366,8 @@ def manipulate!(options={}, &block)
       end
 
       destroy_image(frames)
-    rescue ::Magick::ImageMagickError
-      raise CarrierWave::ProcessingError, I18n.translate(:"errors.messages.processing_error")
+    rescue ::Magick::ImageMagickError => e
+      raise CarrierWave::ProcessingError, I18n.translate(:"errors.messages.processing_error") + ": #{e.message}"
     end
 
   private