summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--bitbake/lib/toaster/contrib/django-aggregate-if-master/aggregate_if.py2
-rw-r--r--bitbake/lib/toaster/toastermain/settings.py9
2 files changed, 10 insertions, 1 deletions
diff --git a/bitbake/lib/toaster/contrib/django-aggregate-if-master/aggregate_if.py b/bitbake/lib/toaster/contrib/django-aggregate-if-master/aggregate_if.py
index 4ea9e8c06e..d5f3427170 100644
--- a/bitbake/lib/toaster/contrib/django-aggregate-if-master/aggregate_if.py
+++ b/bitbake/lib/toaster/contrib/django-aggregate-if-master/aggregate_if.py
@@ -10,7 +10,7 @@ This code was based on the work of others found on the internet:
104. https://groups.google.com/forum/?fromgroups=#!topic/django-users/vVprMpsAnPo 104. https://groups.google.com/forum/?fromgroups=#!topic/django-users/vVprMpsAnPo
11''' 11'''
12from __future__ import unicode_literals 12from __future__ import unicode_literals
13import six 13from django.utils import six
14import django 14import django
15from django.db.models.aggregates import Aggregate as DjangoAggregate 15from django.db.models.aggregates import Aggregate as DjangoAggregate
16from django.db.models.sql.aggregates import Aggregate as DjangoSqlAggregate 16from django.db.models.sql.aggregates import Aggregate as DjangoSqlAggregate
diff --git a/bitbake/lib/toaster/toastermain/settings.py b/bitbake/lib/toaster/toastermain/settings.py
index 141ad08877..60e80de2f6 100644
--- a/bitbake/lib/toaster/toastermain/settings.py
+++ b/bitbake/lib/toaster/toastermain/settings.py
@@ -393,3 +393,12 @@ class InvalidString(str):
393 "Undefined variable or unknown value for: \"%s\"" % other) 393 "Undefined variable or unknown value for: \"%s\"" % other)
394 394
395TEMPLATE_STRING_IF_INVALID = InvalidString("%s") 395TEMPLATE_STRING_IF_INVALID = InvalidString("%s")
396
397import sys
398sys.path.append(
399 os.path.join(
400 os.path.join(
401 os.path.dirname(os.path.dirname(os.path.abspath(__file__))),
402 "contrib"),
403 "django-aggregate-if-master")
404 )