summaryrefslogtreecommitdiffstats
path: root/bitbake/lib/bb/ui
diff options
context:
space:
mode:
authorEd Bartosh <ed.bartosh@linux.intel.com>2016-05-30 15:41:53 +0300
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-06-02 08:24:04 +0100
commit9434eee39aafa562d256d190cc66b69b1647ae40 (patch)
treebce4f9e548402f95721e02eaa9674f67d74c9d8c /bitbake/lib/bb/ui
parent2448df7d115eaadd6c17d313e934f76a081f99ef (diff)
downloadpoky-9434eee39aafa562d256d190cc66b69b1647ae40.tar.gz
bitbake: Revert "buildinfohelper: work around unicode exceptions"
This commit causes buildinfohelper to crash when run on python 3 as python 3 doesn't have unicode builtin function. This reverts commit 7a309d964a86f3474eaab7df6d438ed797f935c0. (Bitbake rev: 750ca5c8d5a25fc519b75c56352dec7823c7e240) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'bitbake/lib/bb/ui')
-rw-r--r--bitbake/lib/bb/ui/buildinfohelper.py10
1 files changed, 4 insertions, 6 deletions
diff --git a/bitbake/lib/bb/ui/buildinfohelper.py b/bitbake/lib/bb/ui/buildinfohelper.py
index cea53e053a..d59d6a5f89 100644
--- a/bitbake/lib/bb/ui/buildinfohelper.py
+++ b/bitbake/lib/bb/ui/buildinfohelper.py
@@ -494,7 +494,7 @@ class ORMWrapper(object):
494 parent_obj = self._cached_get(Target_File, target = target_obj, path = parent_path, inodetype = Target_File.ITYPE_DIRECTORY) 494 parent_obj = self._cached_get(Target_File, target = target_obj, path = parent_path, inodetype = Target_File.ITYPE_DIRECTORY)
495 tf_obj = Target_File.objects.create( 495 tf_obj = Target_File.objects.create(
496 target = target_obj, 496 target = target_obj,
497 path = unicode(path, 'utf-8'), 497 path = path,
498 size = size, 498 size = size,
499 inodetype = Target_File.ITYPE_DIRECTORY, 499 inodetype = Target_File.ITYPE_DIRECTORY,
500 permission = permission, 500 permission = permission,
@@ -519,7 +519,7 @@ class ORMWrapper(object):
519 519
520 tf_obj = Target_File.objects.create( 520 tf_obj = Target_File.objects.create(
521 target = target_obj, 521 target = target_obj,
522 path = unicode(path, 'utf-8'), 522 path = path,
523 size = size, 523 size = size,
524 inodetype = inodetype, 524 inodetype = inodetype,
525 permission = permission, 525 permission = permission,
@@ -550,9 +550,7 @@ class ORMWrapper(object):
550 filetarget_path = "/".join(fcpl) 550 filetarget_path = "/".join(fcpl)
551 551
552 try: 552 try:
553 filetarget_obj = Target_File.objects.get( 553 filetarget_obj = Target_File.objects.get(target = target_obj, path = filetarget_path)
554 target = target_obj,
555 path = unicode(filetarget_path, 'utf-8'))
556 except Target_File.DoesNotExist: 554 except Target_File.DoesNotExist:
557 # we might have an invalid link; no way to detect this. just set it to None 555 # we might have an invalid link; no way to detect this. just set it to None
558 filetarget_obj = None 556 filetarget_obj = None
@@ -561,7 +559,7 @@ class ORMWrapper(object):
561 559
562 tf_obj = Target_File.objects.create( 560 tf_obj = Target_File.objects.create(
563 target = target_obj, 561 target = target_obj,
564 path = unicode(path, 'utf-8'), 562 path = path,
565 size = size, 563 size = size,
566 inodetype = Target_File.ITYPE_SYMLINK, 564 inodetype = Target_File.ITYPE_SYMLINK,
567 permission = permission, 565 permission = permission,