kotovalexarian-likes-github/fog--fog
1
0
Fork 0
mirror of https://github.com/fog/fog.git synced 2022-11-09 13:51:43 -05:00
Code Releases Activity

Merge pull request #1725 from promisedlandt/s3_location_fix

Browse source 
Fix S3 directory location infinite loop
This commit is contained in:
Wesley Beary 2013-04-02 09:48:50 -07:00
commit 21cc1badde
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
fog.gemspec
View file

@ -7,7 +7,7 @@ Gem::Specification.new do |s|
## the sub! line in the Rakefile ## the sub! line in the Rakefile
s.name = 'fog' s.name = 'fog'
s.version = '1.10.0' s.version = '1.10.0'
s.date = '2013-03-05' s.date = '2013-03-30'
s.rubyforge_project = 'fog' s.rubyforge_project = 'fog'
## Make sure your summary is short. The description may be as long ## Make sure your summary is short. The description may be as long

2
lib/fog/aws/models/storage/directory.rb
View file

@ -43,7 +43,7 @@ module Fog
if INVALID_LOCATIONS.include?(new_location) if INVALID_LOCATIONS.include?(new_location)
raise ArgumentError, "location must not include any of #{INVALID_LOCATIONS.join(', ')}. See http://docs.amazonwebservices.com/AmazonS3/latest/API/RESTBucketPUT.html" raise ArgumentError, "location must not include any of #{INVALID_LOCATIONS.join(', ')}. See http://docs.amazonwebservices.com/AmazonS3/latest/API/RESTBucketPUT.html"
else else
merge_attributes(:location => new_location) @location = new_location
end end
end end