@@ -189,10 +189,10 @@ module AWS # Updates the object with <tt>key</tt> by copying it in-place, preserving the ACL of the existing object. # Useful for updating an object's metadata without having to re-PUT the data. def update(key, bucket = nil, options = {}) - bucket = bucket_name(bucket) - source_key = path!(bucket, key) + bucket = bucket_name(bucket) + source_key = path!(bucket, key) default_options = {'x-amz-copy-source' => source_key, 'x-amz-metadata-directive' => 'REPLACE'} - returning put(source_key, default_options.merge(options)) do + returning put(source_key, options.merge(default_options)) do acl(key, bucket, acl(key, bucket)) end end lib/aws/s3/object.rb 55c64b614f8ae0ce95dbe9bfc5461e08d72c62f5 Jeffrey Hardy packagethief@gmail.com http://github.com/packagethief/aws-s3/commit/5a05f8d04cf987ee0ea48a41c175a297b0cc0dc6 5a05f8d04cf987ee0ea48a41c175a297b0cc0dc6 2009-10-16T15:47:01-07:00 2009-10-16T15:47:01-07:00 Our default options take precedence 2f1a308af4c992738abbeedc5012ea2bbadddd6c Jeffrey Hardy packagethief@gmail.com