From ba7689302cae9df64665accebb4d0f0f9ad1f9ac Mon Sep 17 00:00:00 2001 From: Nils Landt Date: Sat, 30 Mar 2013 06:14:05 +0100 Subject: [PATCH] Fix S3 directory location infinite loop --- fog.gemspec | 2 +- lib/fog/aws/models/storage/directory.rb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/fog.gemspec b/fog.gemspec index 6908dfcf2..721ea6c94 100644 --- a/fog.gemspec +++ b/fog.gemspec @@ -7,7 +7,7 @@ Gem::Specification.new do |s| ## the sub! line in the Rakefile s.name = 'fog' s.version = '1.10.0' - s.date = '2013-03-05' + s.date = '2013-03-30' s.rubyforge_project = 'fog' ## Make sure your summary is short. The description may be as long diff --git a/lib/fog/aws/models/storage/directory.rb b/lib/fog/aws/models/storage/directory.rb index bd108a700..7b3bde34f 100644 --- a/lib/fog/aws/models/storage/directory.rb +++ b/lib/fog/aws/models/storage/directory.rb @@ -43,7 +43,7 @@ module Fog 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" else - merge_attributes(:location => new_location) + @location = new_location end end