diff options
| author | Jenkins <jenkins@review.openstack.org> | 2015-03-05 21:25:24 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2015-03-05 21:25:24 +0000 |
| commit | 878a27ceb509b4758d307c4bb90c1ab5f2a46ea1 (patch) | |
| tree | f453acad0b62117d9ce664da874fa94efcbcc0b7 | |
| parent | f43858f414e3d2aa214c86c68ffcc1068f999fd6 (diff) | |
| parent | 897d9cf13d3a3ac527d98cccb570fd96e8b67ff8 (diff) | |
| download | zuul-878a27ceb509b4758d307c4bb90c1ab5f2a46ea1.tar.gz | |
Merge "Fix int conversion in swift"
| -rw-r--r-- | zuul/lib/swift.py | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/zuul/lib/swift.py b/zuul/lib/swift.py index 9b9bea375..3c411d3ff 100644 --- a/zuul/lib/swift.py +++ b/zuul/lib/swift.py @@ -147,8 +147,10 @@ class Swift(object): settings[key] = kwargs[altkey] elif self.config.has_option('swift', 'default_' + key): settings[key] = self.config.get('swift', 'default_' + key) + # TODO: these are always strings; some should be converted + # to ints. - expires = int(time() + settings['expiry']) + expires = int(time() + int(settings['expiry'])) redirect = '' url = os.path.join(self.storage_url, settings['container'], |