sysmo-bts
/
generic-poky
9
0
Fork 0
Code Pull Requests Releases Activity

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 7a309d964a.

(Bitbake rev: 750ca5c8d5a25fc519b75c56352dec7823c7e240)

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Ed Bartosh 2016-05-30 15:41:53 +03:00 committed by Richard Purdie
parent 2448df7d11
commit 9434eee39a
1 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
bitbake/lib/bb/ui/buildinfohelper.py
View File

@ -494,7 +494,7 @@ class ORMWrapper(object):
parent_obj = self._cached_get(Target_File, target = target_obj, path = parent_path, inodetype = Target_File.ITYPE_DIRECTORY)
tf_obj = Target_File.objects.create(
target = target_obj,
path = unicode(path, 'utf-8'),
path = path,
size = size,
inodetype = Target_File.ITYPE_DIRECTORY,
permission = permission,
@ -519,7 +519,7 @@ class ORMWrapper(object):
tf_obj = Target_File.objects.create(
target = target_obj,
path = unicode(path, 'utf-8'),
path = path,
size = size,
inodetype = inodetype,
permission = permission,
@ -550,9 +550,7 @@ class ORMWrapper(object):
filetarget_path = "/".join(fcpl)
try:
filetarget_obj = Target_File.objects.get(
target = target_obj,
path = unicode(filetarget_path, 'utf-8'))
filetarget_obj = Target_File.objects.get(target = target_obj, path = filetarget_path)
except Target_File.DoesNotExist:
# we might have an invalid link; no way to detect this. just set it to None
filetarget_obj = None
@ -561,7 +559,7 @@ class ORMWrapper(object):
tf_obj = Target_File.objects.create(
target = target_obj,
path = unicode(path, 'utf-8'),
path = path,
size = size,
inodetype = Target_File.ITYPE_SYMLINK,
permission = permission,