diff options
| author | Étienne Loks <etienne.loks@peacefrogs.net> | 2012-10-02 19:17:33 +0200 |
|---|---|---|
| committer | Étienne Loks <etienne.loks@peacefrogs.net> | 2012-10-02 19:17:33 +0200 |
| commit | 40e3f0a927b22fef64b6a59c006511b4ba243a07 (patch) | |
| tree | cde63d0487fe0112c1d9c243701a48d53075a30e /chimere/tasks.py | |
| parent | 4bc82f3f73577118d3cc534eaf749d16321c552a (diff) | |
| parent | 58aba7b0661d51e98132e2ed1b726c865316b4a2 (diff) | |
| download | Chimère-40e3f0a927b22fef64b6a59c006511b4ba243a07.tar.bz2 Chimère-40e3f0a927b22fef64b6a59c006511b4ba243a07.zip | |
Merge branch 'master' into saclay
Conflicts:
chimere/admin.py
chimere/locale/fr/LC_MESSAGES/django.po
chimere/models.py
chimere/templates/chimere/main_map.html
chimere/templatetags/chimere_tags.py
chimere/views.py
Diffstat (limited to 'chimere/tasks.py')
| -rw-r--r-- | chimere/tasks.py | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/chimere/tasks.py b/chimere/tasks.py index 2d55bfd..d457f6a 100644 --- a/chimere/tasks.py +++ b/chimere/tasks.py @@ -27,6 +27,7 @@ from django.core.exceptions import ObjectDoesNotExist from django.utils.translation import ugettext_lazy as _ from chimere.models import Importer +from external_utils import OsmApi def single_instance_task(timeout): @@ -110,7 +111,11 @@ def exporting(importer_pk): return importer.state = unicode(IMPORT_MESSAGES['export_process'][0]) importer.save() - updated_item, error = importer.manager.put() + error = None + try: + updated_item, error = importer.manager.put() + except OsmApi.ApiError, error: + pass if error: importer.state = unicode(IMPORT_MESSAGES['export_failed'][0]) \ + u" - " + unicode(IMPORT_MESSAGES['export_failed'][1]) % error |