| Index: third_party/boto/bin/s3put
|
| ===================================================================
|
| --- third_party/boto/bin/s3put (revision 33376)
|
| +++ third_party/boto/bin/s3put (working copy)
|
| @@ -173,6 +173,10 @@
|
|
|
| _upload()
|
|
|
| +def check_valid_region(conn, region):
|
| + if conn is None:
|
| + print 'Invalid region (%s)' % region
|
| + sys.exit(1)
|
|
|
| def multipart_upload(bucketname, aws_key, aws_secret, source_path, keyname,
|
| reduced, debug, cb, num_cb, acl='private', headers={},
|
| @@ -183,6 +187,7 @@
|
| """
|
| conn = boto.s3.connect_to_region(region, aws_access_key_id=aws_key,
|
| aws_secret_access_key=aws_secret)
|
| + check_valid_region(conn, region)
|
| conn.debug = debug
|
| bucket = conn.get_bucket(bucketname)
|
|
|
| @@ -334,6 +339,7 @@
|
| connect_args['host'] = host
|
|
|
| c = boto.s3.connect_to_region(region or DEFAULT_REGION, **connect_args)
|
| + check_valid_region(c, region or DEFAULT_REGION)
|
| c.debug = debug
|
| b = c.get_bucket(bucket_name, validate=False)
|
|
|
|
|