diff --git a/CHANGELOG.md b/CHANGELOG.md index 6494f03..d1a384d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,6 @@ +## 1.1.2 (2017-02-21) +- #53: Fix for no-region regression introduced by #51 + ## 1.1.1 (2017-02-16) - #51: Add support for cn-north-1 region diff --git a/Makefile b/Makefile index 3b30626..b358241 100644 --- a/Makefile +++ b/Makefile @@ -1,5 +1,5 @@ NAME = yum-plugin-s3-iam -VERSION = 1.1.1 +VERSION = 1.1.2 RELEASE = 1 ARCH = noarch diff --git a/s3iam.py b/s3iam.py index ba6fb1f..0a63f1c 100755 --- a/s3iam.py +++ b/s3iam.py @@ -33,7 +33,7 @@ __email__ = "julius@seporaitis.net" __copyright__ = "Copyright 2012, Julius Seporaitis" __license__ = "Apache 2.0" -__version__ = "1.1.1" +__version__ = "1.1.2" __all__ = ['requires_api_version', 'plugin_type', 'CONDUIT', @@ -130,12 +130,11 @@ def __init__(self, repoid, repo): if region: self.baseurl = "https://s3-%s.amazonaws.com/%s%s" % (region, bucket, path) + if 'cn-north-1' in region: + self.baseurl = "https://s3.cn-north-1.amazonaws.com.cn/%s%s" % (bucket, path) else: self.baseurl = "https://%s.s3.amazonaws.com%s" % (bucket, path) - if 'cn-north-1' in region: - self.baseurl = "https://s3.cn-north-1.amazonaws.com.cn/%s%s" % (bucket, path) - self.name = repo.name self.region = repo.region if repo.region else region self.basecachedir = repo.basecachedir diff --git a/yum-plugin-s3-iam.spec b/yum-plugin-s3-iam.spec index c0949d3..8551a79 100644 --- a/yum-plugin-s3-iam.spec +++ b/yum-plugin-s3-iam.spec @@ -37,6 +37,9 @@ rm -rf ${RPM_BUILD_ROOT} /usr/lib/yum-plugins/s3iam.py* %changelog +* Tue Feb 21 2017 Mathias Brossard 1.1.2-1 +- Fix for no-region regression introduced by cn-north-1 region support + * Thu Feb 16 2017 Mathias Brossard 1.1.1-1 - Add support for cn-north-1 region