|
|
@ -459,7 +459,8 @@ def main():
|
|
|
|
walrus = urlparse.urlparse(s3_url).hostname
|
|
|
|
walrus = urlparse.urlparse(s3_url).hostname
|
|
|
|
s3 = boto.connect_walrus(walrus, **aws_connect_kwargs)
|
|
|
|
s3 = boto.connect_walrus(walrus, **aws_connect_kwargs)
|
|
|
|
else:
|
|
|
|
else:
|
|
|
|
s3 = boto.s3.connect_to_region(location, is_secure=True, **aws_connect_kwargs)
|
|
|
|
aws_connect_args['is_secure'] = True
|
|
|
|
|
|
|
|
s3 = connect_to_aws(boto.s3, location, **aws_connect_args)
|
|
|
|
# use this as fallback because connect_to_region seems to fail in boto + non 'classic' aws accounts in some cases
|
|
|
|
# use this as fallback because connect_to_region seems to fail in boto + non 'classic' aws accounts in some cases
|
|
|
|
if s3 is None:
|
|
|
|
if s3 is None:
|
|
|
|
s3 = boto.connect_s3(**aws_connect_kwargs)
|
|
|
|
s3 = boto.connect_s3(**aws_connect_kwargs)
|
|
|
|