]> git.ipfire.org Git - thirdparty/openembedded/openembedded-core-contrib.git/commitdiff
bitbake: toaster: toastertables raise errors
authorAlexandru DAMIAN <alexandru.damian@intel.com>
Fri, 5 Jun 2015 13:13:03 +0000 (14:13 +0100)
committerRichard Purdie <richard.purdie@linuxfoundation.org>
Thu, 11 Jun 2015 23:01:48 +0000 (00:01 +0100)
Modifies the widget code to raise the Exceptions to the user
instead of printing then to stdout - making the programming
errors much more visible.

(Bitbake rev: 26dc19284e06a7ae35f75a243b2062f61e30f2ca)

Signed-off-by: Alexandru DAMIAN <alexandru.damian@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
bitbake/lib/toaster/toastergui/widgets.py

index 407a0fbe15815b3f44c0f98cf1b5c40b32486eca..3d3c1d10df2394ba30fb19a58addd9f250ca0508 100644 (file)
@@ -207,7 +207,8 @@ class ToasterTable(TemplateView):
         try:
             self.filter_actions[filter_action]()
         except KeyError:
-            print "Filter and Filter action pair not found"
+            # pass it to the user - programming error here
+            raise
 
     def apply_orderby(self, orderby):
         # Note that django will execute this when we try to retrieve the data
@@ -217,8 +218,7 @@ class ToasterTable(TemplateView):
         """Creates a query based on the model's search_allowed_fields"""
 
         if not hasattr(self.queryset.model, 'search_allowed_fields'):
-            print "Err Search fields aren't defined in the model"
-            return
+            raise Exception("Err Search fields aren't defined in the model")
 
         search_queries = []
         for st in search_term.split(" "):
@@ -228,9 +228,10 @@ class ToasterTable(TemplateView):
             search_queries.append(reduce(operator.or_, q_map))
 
         search_queries = reduce(operator.and_, search_queries)
-        print "applied the search to the queryset"
+
         self.queryset = self.queryset.filter(search_queries)
 
+
     def get_data(self, request, **kwargs):
         """Returns the data for the page requested with the specified
         parameters applied"""
@@ -318,7 +319,8 @@ class ToasterTable(TemplateView):
                 data['rows'].append(required_data)
 
         except FieldError:
-            print "Error: Requested field does not exist"
+            # pass  it to the user - programming-error here
+            raise
         data = json.dumps(data, indent=2, default=objtojson)
         cache.set(cache_name, data, 60*30)