diff options
author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2021-11-02 11:07:17 +0000 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2021-11-03 10:12:42 +0000 |
commit | 9abab49f2bcac3ea80f96f837e181904bfae8848 (patch) | |
tree | 863f0a8f90ea0ca21e2f7922704fbaee4c0b9650 /bitbake/lib/bb/ui/buildinfohelper.py | |
parent | 5fb6b453f633796f28e230420e17b644adde8b11 (diff) | |
download | poky-9abab49f2bcac3ea80f96f837e181904bfae8848.tar.gz |
bitbake: lib/bb: Clean up use of len()
(Bitbake rev: bbbc843e86639604d00d76b1949b94a78cf1d95d)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'bitbake/lib/bb/ui/buildinfohelper.py')
-rw-r--r-- | bitbake/lib/bb/ui/buildinfohelper.py | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/bitbake/lib/bb/ui/buildinfohelper.py b/bitbake/lib/bb/ui/buildinfohelper.py index 43aa592842..8588849dd4 100644 --- a/bitbake/lib/bb/ui/buildinfohelper.py +++ b/bitbake/lib/bb/ui/buildinfohelper.py | |||
@@ -483,11 +483,11 @@ class ORMWrapper(object): | |||
483 | 483 | ||
484 | # we already created the root directory, so ignore any | 484 | # we already created the root directory, so ignore any |
485 | # entry for it | 485 | # entry for it |
486 | if len(path) == 0: | 486 | if not path: |
487 | continue | 487 | continue |
488 | 488 | ||
489 | parent_path = "/".join(path.split("/")[:len(path.split("/")) - 1]) | 489 | parent_path = "/".join(path.split("/")[:len(path.split("/")) - 1]) |
490 | if len(parent_path) == 0: | 490 | if not parent_path: |
491 | parent_path = "/" | 491 | parent_path = "/" |
492 | parent_obj = self._cached_get(Target_File, target = target_obj, path = parent_path, inodetype = Target_File.ITYPE_DIRECTORY) | 492 | parent_obj = self._cached_get(Target_File, target = target_obj, path = parent_path, inodetype = Target_File.ITYPE_DIRECTORY) |
493 | tf_obj = Target_File.objects.create( | 493 | tf_obj = Target_File.objects.create( |
@@ -633,7 +633,7 @@ class ORMWrapper(object): | |||
633 | packagefile_objects.append(Package_File( package = packagedict[p]['object'], | 633 | packagefile_objects.append(Package_File( package = packagedict[p]['object'], |
634 | path = targetpath, | 634 | path = targetpath, |
635 | size = targetfilesize)) | 635 | size = targetfilesize)) |
636 | if len(packagefile_objects): | 636 | if packagefile_objects: |
637 | Package_File.objects.bulk_create(packagefile_objects) | 637 | Package_File.objects.bulk_create(packagefile_objects) |
638 | except KeyError as e: | 638 | except KeyError as e: |
639 | errormsg += " stpi: Key error, package %s key %s \n" % ( p, e ) | 639 | errormsg += " stpi: Key error, package %s key %s \n" % ( p, e ) |
@@ -673,7 +673,7 @@ class ORMWrapper(object): | |||
673 | logger.warning("Could not add dependency to the package %s " | 673 | logger.warning("Could not add dependency to the package %s " |
674 | "because %s is an unknown package", p, px) | 674 | "because %s is an unknown package", p, px) |
675 | 675 | ||
676 | if len(packagedeps_objs) > 0: | 676 | if packagedeps_objs: |
677 | Package_Dependency.objects.bulk_create(packagedeps_objs) | 677 | Package_Dependency.objects.bulk_create(packagedeps_objs) |
678 | else: | 678 | else: |
679 | logger.info("No package dependencies created") | 679 | logger.info("No package dependencies created") |
@@ -767,7 +767,7 @@ class ORMWrapper(object): | |||
767 | packagefile_objects.append(Package_File( package = bp_object, | 767 | packagefile_objects.append(Package_File( package = bp_object, |
768 | path = path, | 768 | path = path, |
769 | size = package_info['FILES_INFO'][path] )) | 769 | size = package_info['FILES_INFO'][path] )) |
770 | if len(packagefile_objects): | 770 | if packagefile_objects: |
771 | Package_File.objects.bulk_create(packagefile_objects) | 771 | Package_File.objects.bulk_create(packagefile_objects) |
772 | 772 | ||
773 | def _po_byname(p): | 773 | def _po_byname(p): |
@@ -809,7 +809,7 @@ class ORMWrapper(object): | |||
809 | packagedeps_objs.append(Package_Dependency( package = bp_object, | 809 | packagedeps_objs.append(Package_Dependency( package = bp_object, |
810 | depends_on = _po_byname(p), dep_type = Package_Dependency.TYPE_RCONFLICTS)) | 810 | depends_on = _po_byname(p), dep_type = Package_Dependency.TYPE_RCONFLICTS)) |
811 | 811 | ||
812 | if len(packagedeps_objs) > 0: | 812 | if packagedeps_objs: |
813 | Package_Dependency.objects.bulk_create(packagedeps_objs) | 813 | Package_Dependency.objects.bulk_create(packagedeps_objs) |
814 | 814 | ||
815 | return bp_object | 815 | return bp_object |
@@ -826,7 +826,7 @@ class ORMWrapper(object): | |||
826 | desc = vardump[root_var]['doc'] | 826 | desc = vardump[root_var]['doc'] |
827 | if desc is None: | 827 | if desc is None: |
828 | desc = '' | 828 | desc = '' |
829 | if len(desc): | 829 | if desc: |
830 | HelpText.objects.get_or_create(build=build_obj, | 830 | HelpText.objects.get_or_create(build=build_obj, |
831 | area=HelpText.VARIABLE, | 831 | area=HelpText.VARIABLE, |
832 | key=k, text=desc) | 832 | key=k, text=desc) |
@@ -846,7 +846,7 @@ class ORMWrapper(object): | |||
846 | file_name = vh['file'], | 846 | file_name = vh['file'], |
847 | line_number = vh['line'], | 847 | line_number = vh['line'], |
848 | operation = vh['op'])) | 848 | operation = vh['op'])) |
849 | if len(varhist_objects): | 849 | if varhist_objects: |
850 | VariableHistory.objects.bulk_create(varhist_objects) | 850 | VariableHistory.objects.bulk_create(varhist_objects) |
851 | 851 | ||
852 | 852 | ||
@@ -1069,7 +1069,7 @@ class BuildInfoHelper(object): | |||
1069 | for t in self.internal_state['targets']: | 1069 | for t in self.internal_state['targets']: |
1070 | buildname = self.internal_state['build'].build_name | 1070 | buildname = self.internal_state['build'].build_name |
1071 | pe, pv = task_object.recipe.version.split(":",1) | 1071 | pe, pv = task_object.recipe.version.split(":",1) |
1072 | if len(pe) > 0: | 1072 | if pe: |
1073 | package = task_object.recipe.name + "-" + pe + "_" + pv | 1073 | package = task_object.recipe.name + "-" + pe + "_" + pv |
1074 | else: | 1074 | else: |
1075 | package = task_object.recipe.name + "-" + pv | 1075 | package = task_object.recipe.name + "-" + pv |
@@ -1618,7 +1618,7 @@ class BuildInfoHelper(object): | |||
1618 | 1618 | ||
1619 | if 'backlog' in self.internal_state: | 1619 | if 'backlog' in self.internal_state: |
1620 | # if we have a backlog of events, do our best to save them here | 1620 | # if we have a backlog of events, do our best to save them here |
1621 | if len(self.internal_state['backlog']): | 1621 | if self.internal_state['backlog']: |
1622 | tempevent = self.internal_state['backlog'].pop() | 1622 | tempevent = self.internal_state['backlog'].pop() |
1623 | logger.debug("buildinfohelper: Saving stored event %s " | 1623 | logger.debug("buildinfohelper: Saving stored event %s " |
1624 | % tempevent) | 1624 | % tempevent) |