[oe-commits] [bitbake] 24/40: toaster: fix unhandled exception

[git at git.openembedded.org]

rpurdie pushed a commit to branch master
in repository bitbake.

commit 01891c13ae8dcba64e5cf79956f1b64c2afdaae3
Author: Ed Bartosh <ed.bartosh at linux.intel.com>
AuthorDate: Wed Jul 27 15:15:02 2016 +0300

    toaster: fix unhandled exception
    
    manage.py lsupdates throws DataError exception if the recipe can't be
    saved to the MySQL database:
        django.db.utils.DataError: (1406, "Data too long for column 'license' at row 1"
    
    Adding DataError exception to the list of exceptions should make
    lsupdates to print a warning message and skip the recipe.
    
    Signed-off-by: Ed Bartosh <ed.bartosh at linux.intel.com>
---
 lib/toaster/orm/models.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/toaster/orm/models.py b/lib/toaster/orm/models.py
index 3da9a66..1c9f3a9 100644
--- a/lib/toaster/orm/models.py
+++ b/lib/toaster/orm/models.py
@@ -21,7 +21,7 @@
 
 from __future__ import unicode_literals
 
-from django.db import models, IntegrityError
+from django.db import models, IntegrityError, DataError
 from django.db.models import F, Q, Sum, Count
 from django.utils import timezone
 from django.utils.encoding import force_bytes
@@ -78,7 +78,7 @@ if 'sqlite' in settings.DATABASES['default']['ENGINE']:
         try:
             obj = self.create(**params)
             return obj, True
-        except IntegrityError:
+        except (IntegrityError, DataError):
             exc_info = sys.exc_info()
             try:
                 return self.get(**lookup), False

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.