diff options
| author | Christopher Allan Webber <cwebber@dustycloud.org> | 2011-11-24 15:24:58 -0600 |
|---|---|---|
| committer | Christopher Allan Webber <cwebber@dustycloud.org> | 2011-11-24 15:24:58 -0600 |
| commit | 99d2ac1d83962fb4dc38f01d63d2ad4036226765 (patch) | |
| tree | 5c8a3a8c6f7ee5ea3662a6c791855864c5784e1a /mediagoblin/storage/cloudfiles.py | |
| parent | 30188321531e1b0d3c78166498702bbd8c7dc2bc (diff) | |
| parent | 6506b1e22c70b55a73ee4cb391aebaf73db79ef9 (diff) | |
| download | mediagoblin-99d2ac1d83962fb4dc38f01d63d2ad4036226765.tar.lz mediagoblin-99d2ac1d83962fb4dc38f01d63d2ad4036226765.tar.xz mediagoblin-99d2ac1d83962fb4dc38f01d63d2ad4036226765.zip | |
Merge remote-tracking branch 'remotes/jwandborg/master'
Diffstat (limited to 'mediagoblin/storage/cloudfiles.py')
| -rw-r--r-- | mediagoblin/storage/cloudfiles.py | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/mediagoblin/storage/cloudfiles.py b/mediagoblin/storage/cloudfiles.py index 0d3cc3df..51b73579 100644 --- a/mediagoblin/storage/cloudfiles.py +++ b/mediagoblin/storage/cloudfiles.py @@ -98,8 +98,14 @@ class CloudFilesStorage(StorageInterface): def delete_file(self, filepath): # TODO: Also delete unused directories if empty (safely, with # checks to avoid race conditions). - self.container.delete_object( - self._resolve_filepath(filepath)) + try: + self.container.delete_object( + self._resolve_filepath(filepath)) + except cloudfiles.container.ResponseError: + pass + finally: + pass + def file_url(self, filepath): return '/'.join([ |