@@ -1,5 +1,10 @@

 2010-05-21  Michal Ludvig  <mludvig@logix.net.nz>

+	* s3cmd, S3/S3.py: Added support for bucket locations

+	  outside US/EU (i.e. us-west-1 and ap-southeast-1 as of now).

+

+2010-05-21  Michal Ludvig  <mludvig@logix.net.nz>

+

 	* s3cmd, S3/S3.py, S3/Config.py: Added --reduced-redundancy

 	  switch for Reduced Redundancy Storage.

@@ -205,8 +205,13 @@ class S3(object):

 		headers = SortedDict(ignore_case = True)

 		body = ""

 		if bucket_location and bucket_location.strip().upper() != "US":

+			bucket_location = bucket_location.strip()

+			if bucket_location.upper() == "EU":

+				bucket_location = bucket_location.upper()

+			else:

+				bucket_location = bucket_location.lower()

 			body  = "<CreateBucketConfiguration><LocationConstraint>"

-			body += bucket_location.strip().upper()

+			body += bucket_location

 			body += "</LocationConstraint></CreateBucketConfiguration>"

 			debug("bucket_location: " + body)

 			self.check_bucket_name(bucket, dns_strict = True)

@@ -1596,7 +1596,7 @@ def main():

 	optparser.add_option(      "--rinclude", dest="rinclude", action="append", metavar="REGEXP", help="Same as --include but uses REGEXP (regular expression) instead of GLOB")

 	optparser.add_option(      "--rinclude-from", dest="rinclude_from", action="append", metavar="FILE", help="Read --rinclude REGEXPs from FILE")

-	optparser.add_option(      "--bucket-location", dest="bucket_location", help="Datacentre to create bucket in. Either EU or US (default)")

+	optparser.add_option(      "--bucket-location", dest="bucket_location", help="Datacentre to create bucket in. As of now the datacenters are: US (default), EU, us-west-1, and ap-southeast-1")

 	optparser.add_option(      "--reduced-redundancy", "--rr", dest="reduced_redundancy", action="store_true", help="Store object with 'Reduced redundancy'. Lower per-GB price. [put, cp, mv]")

 	optparser.add_option(      "--log-target-prefix", dest="log_target_prefix", help="Target prefix for access logs (S3 URI)")