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/process_media/__init__.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/process_media/__init__.py')
| -rw-r--r-- | mediagoblin/process_media/__init__.py | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/mediagoblin/process_media/__init__.py b/mediagoblin/process_media/__init__.py index 54c0c493..346bb479 100644 --- a/mediagoblin/process_media/__init__.py +++ b/mediagoblin/process_media/__init__.py @@ -54,10 +54,13 @@ class ProcessMedia(Task): # Try to process, and handle expected errors. try: + __import__(entry['media_type']) process_image(entry) except BaseProcessingFail, exc: mark_entry_failed(entry._id, exc) return + except ImportError, exc: + mark_entry_failed(entry[u'_id'], exc) entry['state'] = u'processed' entry.save() |