summaryrefslogtreecommitdiffstats
path: root/bitbake/lib/toaster/bldcontrol
diff options
context:
space:
mode:
authorSujith H <sujith.h@gmail.com>2016-03-08 18:09:02 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-03-09 22:45:16 +0000
commitcc74a8ae26a7728828a3442ba441b1676bc2c8a1 (patch)
tree5a8ce987f308378274a7bc5caa51996eb1234106 /bitbake/lib/toaster/bldcontrol
parentaebc22dbfade9a107f1a05e42bf7fe3887c15ae8 (diff)
downloadpoky-cc74a8ae26a7728828a3442ba441b1676bc2c8a1.tar.gz
bitbake: toaster: use force_bytes to display non-ascii project names
When user enters a non-ascii character in the project name of toaster, the build doesn't get triggered. Use force_bytes to fix this. Also deal with non-ascii project names when logging the build request in runbuilds. [YOCTO #9071] (Bitbake rev: b6141c4d170885d3bdf63074afcb1e41fde0a8f0) Signed-off-by: Sujith H <sujith.h@gmail.com> Signed-off-by: Elliot Smith <elliot.smith@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'bitbake/lib/toaster/bldcontrol')
-rw-r--r--bitbake/lib/toaster/bldcontrol/management/commands/runbuilds.py2
-rw-r--r--bitbake/lib/toaster/bldcontrol/models.py4
2 files changed, 4 insertions, 2 deletions
diff --git a/bitbake/lib/toaster/bldcontrol/management/commands/runbuilds.py b/bitbake/lib/toaster/bldcontrol/management/commands/runbuilds.py
index edf71a7d7b..0bd5d08226 100644
--- a/bitbake/lib/toaster/bldcontrol/management/commands/runbuilds.py
+++ b/bitbake/lib/toaster/bldcontrol/management/commands/runbuilds.py
@@ -47,7 +47,7 @@ class Command(NoArgsCommand):
47 logger.debug("runbuilds: No build env") 47 logger.debug("runbuilds: No build env")
48 return 48 return
49 49
50 logger.debug("runbuilds: starting build %s, environment %s" % (br, bec.be)) 50 logger.debug("runbuilds: starting build %s, environment %s" % (str(br).decode('utf-8'), bec.be))
51 51
52 # write the build identification variable 52 # write the build identification variable
53 BRVariable.objects.create(req = br, name="TOASTER_BRBE", value="%d:%d" % (br.pk, bec.be.pk)) 53 BRVariable.objects.create(req = br, name="TOASTER_BRBE", value="%d:%d" % (br.pk, bec.be.pk))
diff --git a/bitbake/lib/toaster/bldcontrol/models.py b/bitbake/lib/toaster/bldcontrol/models.py
index 9244ed1d81..9b2d0d0b24 100644
--- a/bitbake/lib/toaster/bldcontrol/models.py
+++ b/bitbake/lib/toaster/bldcontrol/models.py
@@ -1,5 +1,7 @@
1from __future__ import unicode_literals
1from django.db import models 2from django.db import models
2from django.core.validators import MaxValueValidator, MinValueValidator 3from django.core.validators import MaxValueValidator, MinValueValidator
4from django.utils.encoding import force_bytes
3from orm.models import Project, ProjectLayer, ProjectVariable, ProjectTarget, Build, Layer_Version 5from orm.models import Project, ProjectLayer, ProjectVariable, ProjectTarget, Build, Layer_Version
4 6
5# a BuildEnvironment is the equivalent of the "build/" directory on the localhost 7# a BuildEnvironment is the equivalent of the "build/" directory on the localhost
@@ -94,7 +96,7 @@ class BuildRequest(models.Model):
94 return self.brvariable_set.get(name="MACHINE").value 96 return self.brvariable_set.get(name="MACHINE").value
95 97
96 def __str__(self): 98 def __str__(self):
97 return "%s %s" % (self.project, self.get_state_display()) 99 return force_bytes('%s %s' % (self.project, self.get_state_display()))
98 100
99# These tables specify the settings for running an actual build. 101# These tables specify the settings for running an actual build.
100# They MUST be kept in sync with the tables in orm.models.Project* 102# They MUST be kept in sync with the tables in orm.models.Project*