[gnome-continuous-yocto/gnomeostree-3.28-rocko: 630/8267] bitbake: toaster: use force_text instead of force_bytes

[Emmanuele Bassi <ebassi src gnome org>]

commit 7c44d883b432cbededb1e2620d3823e603fd25c0
Author: Ed Bartosh <ed bartosh linux intel com>
Date:   Tue May 10 11:04:49 2016 +0300

    bitbake: toaster: use force_text instead of force_bytes
    
    Usage of force_bytes in BuildRequest.__str__ method caused
    python 3 to throw "__str__ returned non-string (type bytes)"
    error.
    
    Replaced force_bytes with force_text to make the code working
    on both python 2 and python 3.
    
    [YOCTO #9584]
    
    (Bitbake rev: 9dd9c1393a84d1110c647e84253af8e0bb6acc45)
    
    Signed-off-by: Ed Bartosh <ed bartosh linux intel com>
    Signed-off-by: Richard Purdie <richard purdie linuxfoundation org>

 .../bldcontrol/management/commands/runbuilds.py    |    4 ++--
 bitbake/lib/toaster/bldcontrol/models.py           |    4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)
---
diff --git a/bitbake/lib/toaster/bldcontrol/management/commands/runbuilds.py 
b/bitbake/lib/toaster/bldcontrol/management/commands/runbuilds.py
index e3145e8..80782ef 100644
--- a/bitbake/lib/toaster/bldcontrol/management/commands/runbuilds.py
+++ b/bitbake/lib/toaster/bldcontrol/management/commands/runbuilds.py
@@ -54,8 +54,8 @@ class Command(NoArgsCommand):
                 logger.debug("runbuilds: No build env")
                 return
 
-            logger.debug("runbuilds: starting build %s, environment %s" % \
-                         (str(br).decode('utf-8'), bec.be))
+            logger.info("runbuilds: starting build %s, environment %s" % \
+                        (br, bec.be))
 
             # let the build request know where it is being executed
             br.environment = bec.be
diff --git a/bitbake/lib/toaster/bldcontrol/models.py b/bitbake/lib/toaster/bldcontrol/models.py
index e09ad20..f06c562 100644
--- a/bitbake/lib/toaster/bldcontrol/models.py
+++ b/bitbake/lib/toaster/bldcontrol/models.py
@@ -1,7 +1,7 @@
 from __future__ import unicode_literals
 from django.db import models
 from django.core.validators import MaxValueValidator, MinValueValidator
-from django.utils.encoding import force_bytes
+from django.utils.encoding import force_text
 from orm.models import Project, ProjectLayer, ProjectVariable, ProjectTarget, Build, Layer_Version
 
 import logging
@@ -121,7 +121,7 @@ class BuildRequest(models.Model):
         return self.brvariable_set.get(name="MACHINE").value
 
     def __str__(self):
-        return force_bytes('%s %s' % (self.project, self.get_state_display()))
+        return force_text('%s %s' % (self.project, self.get_state_display()))
 
 # These tables specify the settings for running an actual build.
 # They MUST be kept in sync with the tables in orm.models.Project*