diff options
Diffstat (limited to 'bitbake')
-rw-r--r-- | bitbake/lib/bb/ui/buildinfohelper.py | 10 |
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, |