Commit 3dcc08c2 by Isaac Betesh Committed by Jon Yurek

restricted some aws-sdk versions that aren't compatiable with paperclip -- fixes #1968

parent 0443e805
...@@ -126,6 +126,9 @@ module Paperclip ...@@ -126,6 +126,9 @@ module Paperclip
e.message << " (You may need to install the aws-sdk gem)" e.message << " (You may need to install the aws-sdk gem)"
raise e raise e
end end
if Gem::Version.new(AWS_CLASS::VERSION) >= Gem::Version.new(2) && Gem::Version.new(AWS_CLASS::VERSION) <= Gem::Version.new("2.0.33")
raise LoadError, "paperclip does not support aws-sdk versions 2.0.0 - 2.0.33. Please upgrade aws-sdk to a newer version."
end
end end
# Overriding log formatter to make sure it return a UTF-8 string # Overriding log formatter to make sure it return a UTF-8 string
......
...@@ -35,7 +35,7 @@ Gem::Specification.new do |s| ...@@ -35,7 +35,7 @@ Gem::Specification.new do |s|
s.add_development_dependency('rspec', '~> 3.0') s.add_development_dependency('rspec', '~> 3.0')
s.add_development_dependency('appraisal') s.add_development_dependency('appraisal')
s.add_development_dependency('mocha') s.add_development_dependency('mocha')
s.add_development_dependency('aws-sdk', '>= 1.5.7', "< 3.0") s.add_development_dependency('aws-sdk', '>= 1.5.7', "< 3.0", *((0..33).to_a.collect{ |release_number| "!= 2.0.#{release_number}" }))
s.add_development_dependency('bourne') s.add_development_dependency('bourne')
s.add_development_dependency('cucumber', '~> 1.3.18') s.add_development_dependency('cucumber', '~> 1.3.18')
s.add_development_dependency('aruba') s.add_development_dependency('aruba')
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment