matthias/mayan-edms
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Improved handling of Issue #10

Browse Source
This commit is contained in:
Roberto Rosario
2011-08-08 23:38:36 -04:00
parent 84e12efb43
commit 08bc9ebf0e
3 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
apps/history/api.py
View File

@@ -7,6 +7,7 @@ except ImportError:
class OperationalError(Exception): class OperationalError(Exception):
pass pass
from django.core.exceptions import ImproperlyConfigured
from django.db import transaction from django.db import transaction
from django.db.utils import DatabaseError from django.db.utils import DatabaseError
#from django.utils import simplejson #from django.utils import simplejson
@@ -38,7 +39,7 @@ def register_history_type(history_type_dict):
except DatabaseError: except DatabaseError:
transaction.rollback() transaction.rollback()
# Special case for ./manage.py syncdb # Special case for ./manage.py syncdb
except OperationalError: except (OperationalError, ImproperlyConfigured):
transaction.rollback() transaction.rollback()
# Special for DjangoZoom, which executes collectstatic media # Special for DjangoZoom, which executes collectstatic media
# doing syncdb and creating the database tables # doing syncdb and creating the database tables

5
apps/ocr/__init__.py
View File

@@ -3,7 +3,8 @@ try:
except ImportError: except ImportError:
class OperationalError(Exception): class OperationalError(Exception):
pass pass
from django.core.exceptions import ImproperlyConfigured
from django.db import transaction from django.db import transaction
from django.utils.translation import ugettext_lazy as _ from django.utils.translation import ugettext_lazy as _
from django.utils.translation import ugettext from django.utils.translation import ugettext
@@ -82,7 +83,7 @@ def create_default_queue():
except DatabaseError: except DatabaseError:
transaction.rollback() transaction.rollback()
# Special case for ./manage.py syncdb # Special case for ./manage.py syncdb
except OperationalError: except (OperationalError, ImproperlyConfigured):
transaction.rollback() transaction.rollback()
# Special for DjangoZoom, which executes collectstatic media # Special for DjangoZoom, which executes collectstatic media
# doing syncdb and creating the database tables # doing syncdb and creating the database tables

3
apps/permissions/api.py
View File

@@ -4,6 +4,7 @@ except ImportError:
class OperationalError(Exception): class OperationalError(Exception):
pass pass
from django.core.exceptions import ImproperlyConfigured
from django.db import transaction from django.db import transaction
from django.db.utils import DatabaseError from django.db.utils import DatabaseError
from django.shortcuts import get_object_or_404 from django.shortcuts import get_object_or_404
@@ -36,7 +37,7 @@ def register_permission(permission):
except DatabaseError: except DatabaseError:
transaction.rollback() transaction.rollback()
# Special case for ./manage.py syncdb # Special case for ./manage.py syncdb
except OperationalError: except (OperationalError, ImproperlyConfigured):
transaction.rollback() transaction.rollback()
# Special for DjangoZoom, which executes collectstatic media # Special for DjangoZoom, which executes collectstatic media
# doing syncdb and creating the database tables # doing syncdb and creating the database tables