diff options
| author | Michael Still <mikal@stillhq.com> | 2012-10-23 14:25:25 -0700 |
|---|---|---|
| committer | Michael Still <mikal@stillhq.com> | 2012-10-25 09:20:46 +1100 |
| commit | 0d4e6dbe6f17d0a8d0f93833c1ea70f79944d945 (patch) | |
| tree | cdd80ba89da8567c5e1abc82a0ede862d6dd578d /nova/objectstore | |
| parent | 86b91474d16fb9842bb75dc7ebd1af364cc8a058 (diff) | |
| download | nova-0d4e6dbe6f17d0a8d0f93833c1ea70f79944d945.tar.gz | |
Migrate to fileutils and lockutils.
Migrate nova to using openstack-common's file and lock utilities.
Resolves bug 1063230.
Change-Id: I1a4c87856bc08cd33b61d7098ed856baa4583654
Diffstat (limited to 'nova/objectstore')
| -rw-r--r-- | nova/objectstore/s3server.py | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/nova/objectstore/s3server.py b/nova/objectstore/s3server.py index b98a2024f0..dfc2cc9725 100644 --- a/nova/objectstore/s3server.py +++ b/nova/objectstore/s3server.py @@ -46,6 +46,7 @@ import webob from nova import flags from nova.openstack.common import cfg +from nova.openstack.common import fileutils from nova import utils from nova import wsgi @@ -93,7 +94,7 @@ class S3Application(wsgi.Router): mapper.connect('/{bucket_name}/', controller=lambda *a, **kw: BucketHandler(self)(*a, **kw)) self.directory = os.path.abspath(root_directory) - utils.ensure_tree(self.directory) + fileutils.ensure_tree(self.directory) self.bucket_depth = bucket_depth super(S3Application, self).__init__(mapper) @@ -285,7 +286,7 @@ class BucketHandler(BaseRequestHandler): os.path.exists(path)): self.set_status(403) return - utils.ensure_tree(path) + fileutils.ensure_tree(path) self.finish() def delete(self, bucket_name): @@ -334,7 +335,7 @@ class ObjectHandler(BaseRequestHandler): self.set_status(403) return directory = os.path.dirname(path) - utils.ensure_tree(directory) + fileutils.ensure_tree(directory) object_file = open(path, "w") object_file.write(self.request.body) object_file.close() |