diff options
| author | Joar Wandborg <git@wandborg.com> | 2011-11-21 21:51:30 +0100 |
|---|---|---|
| committer | Joar Wandborg <git@wandborg.com> | 2011-11-21 21:51:30 +0100 |
| commit | b9e1fa280edfff4daf424bbcf51bd651ed00f411 (patch) | |
| tree | 9f373c6443874bc5542115a79860da5957a1e182 /mediagoblin/storage/cloudfiles.py | |
| parent | e56e5f8c5c3dc7909aa68a1543ed04ddb18e27f6 (diff) | |
| parent | c875bb74a8245b39b6985f37cb8ab838c22efa7e (diff) | |
| download | mediagoblin-b9e1fa280edfff4daf424bbcf51bd651ed00f411.tar.lz mediagoblin-b9e1fa280edfff4daf424bbcf51bd651ed00f411.tar.xz mediagoblin-b9e1fa280edfff4daf424bbcf51bd651ed00f411.zip | |
Merge branch 'video_gstreamer-only'
Conflicts:
mediagoblin/db/migrations.py
mediagoblin/submit/views.py
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([ |