diff options
Diffstat (limited to 'bitbake/lib/toaster')
5 files changed, 15 insertions, 15 deletions
diff --git a/bitbake/lib/toaster/bldcontrol/management/commands/checksettings.py b/bitbake/lib/toaster/bldcontrol/management/commands/checksettings.py index cfcd4a00e5..20f9dce569 100644 --- a/bitbake/lib/toaster/bldcontrol/management/commands/checksettings.py +++ b/bitbake/lib/toaster/bldcontrol/management/commands/checksettings.py | |||
@@ -78,7 +78,7 @@ class Command(BaseCommand): | |||
78 | template_conf = os.environ.get("TEMPLATECONF", "") | 78 | template_conf = os.environ.get("TEMPLATECONF", "") |
79 | custom_xml_only = os.environ.get("CUSTOM_XML_ONLY") | 79 | custom_xml_only = os.environ.get("CUSTOM_XML_ONLY") |
80 | 80 | ||
81 | if ToasterSetting.objects.filter(name='CUSTOM_XML_ONLY').count() > 0 or (not custom_xml_only == None): | 81 | if ToasterSetting.objects.filter(name='CUSTOM_XML_ONLY').count() > 0 or custom_xml_only is not None: |
82 | # only use the custom settings | 82 | # only use the custom settings |
83 | pass | 83 | pass |
84 | elif "poky" in template_conf: | 84 | elif "poky" in template_conf: |
diff --git a/bitbake/lib/toaster/orm/models.py b/bitbake/lib/toaster/orm/models.py index bb6b5decff..caf069721a 100644 --- a/bitbake/lib/toaster/orm/models.py +++ b/bitbake/lib/toaster/orm/models.py | |||
@@ -1647,14 +1647,14 @@ class CustomImageRecipe(Recipe): | |||
1647 | """ | 1647 | """ |
1648 | # Check if we're aldready up-to-date or not | 1648 | # Check if we're aldready up-to-date or not |
1649 | target = self.get_last_successful_built_target() | 1649 | target = self.get_last_successful_built_target() |
1650 | if target == None: | 1650 | if target is None: |
1651 | # So we've never actually built this Custom recipe but what about | 1651 | # So we've never actually built this Custom recipe but what about |
1652 | # the recipe it's based on? | 1652 | # the recipe it's based on? |
1653 | target = \ | 1653 | target = \ |
1654 | Target.objects.filter(Q(build__outcome=Build.SUCCEEDED) & | 1654 | Target.objects.filter(Q(build__outcome=Build.SUCCEEDED) & |
1655 | Q(build__project=self.project) & | 1655 | Q(build__project=self.project) & |
1656 | Q(target=self.base_recipe.name)).last() | 1656 | Q(target=self.base_recipe.name)).last() |
1657 | if target == None: | 1657 | if target is None: |
1658 | return | 1658 | return |
1659 | 1659 | ||
1660 | if target.build.completed_on == self.last_updated: | 1660 | if target.build.completed_on == self.last_updated: |
diff --git a/bitbake/lib/toaster/toastergui/templatetags/projecttags.py b/bitbake/lib/toaster/toastergui/templatetags/projecttags.py index 354b61f081..b703da3048 100644 --- a/bitbake/lib/toaster/toastergui/templatetags/projecttags.py +++ b/bitbake/lib/toaster/toastergui/templatetags/projecttags.py | |||
@@ -212,7 +212,7 @@ def filtered_installedsize(size, installed_size): | |||
212 | """If package.installed_size not null and not empty return it, | 212 | """If package.installed_size not null and not empty return it, |
213 | else return package.size | 213 | else return package.size |
214 | """ | 214 | """ |
215 | return size if (installed_size == 0) or (installed_size == "") or (installed_size == None) else installed_size | 215 | return size if (installed_size == 0) or (installed_size == "") or (installed_size is None) else installed_size |
216 | 216 | ||
217 | @register.filter | 217 | @register.filter |
218 | def filtered_packageversion(version, revision): | 218 | def filtered_packageversion(version, revision): |
@@ -228,7 +228,7 @@ def filter_sizeovertotal(package_object, total_size): | |||
228 | formatted nicely. | 228 | formatted nicely. |
229 | """ | 229 | """ |
230 | size = package_object.installed_size | 230 | size = package_object.installed_size |
231 | if size == None or size == '': | 231 | if size is None or size == '': |
232 | size = package_object.size | 232 | size = package_object.size |
233 | 233 | ||
234 | return '{:.1%}'.format(float(size)/float(total_size)) | 234 | return '{:.1%}'.format(float(size)/float(total_size)) |
diff --git a/bitbake/lib/toaster/toastergui/views.py b/bitbake/lib/toaster/toastergui/views.py index 7fecdaa973..e2ead830b1 100644 --- a/bitbake/lib/toaster/toastergui/views.py +++ b/bitbake/lib/toaster/toastergui/views.py | |||
@@ -51,7 +51,7 @@ class MimeTypeFinder(object): | |||
51 | def get_mimetype(self, path): | 51 | def get_mimetype(self, path): |
52 | guess = mimetypes.guess_type(path, self._strict) | 52 | guess = mimetypes.guess_type(path, self._strict) |
53 | guessed_type = guess[0] | 53 | guessed_type = guess[0] |
54 | if guessed_type == None: | 54 | if guessed_type is None: |
55 | guessed_type = 'application/octet-stream' | 55 | guessed_type = 'application/octet-stream' |
56 | return guessed_type | 56 | return guessed_type |
57 | 57 | ||
@@ -126,7 +126,7 @@ def _lv_to_dict(prj, x = None): | |||
126 | return {"id": x.pk, | 126 | return {"id": x.pk, |
127 | "name": x.layer.name, | 127 | "name": x.layer.name, |
128 | "tooltip": "%s | %s" % (x.layer.vcs_url,x.get_vcs_reference()), | 128 | "tooltip": "%s | %s" % (x.layer.vcs_url,x.get_vcs_reference()), |
129 | "detail": "(%s" % x.layer.vcs_url + (")" if x.release == None else " | "+x.get_vcs_reference()+")"), | 129 | "detail": "(%s" % x.layer.vcs_url + (")" if x.release is None else " | "+x.get_vcs_reference()+")"), |
130 | "giturl": x.layer.vcs_url, | 130 | "giturl": x.layer.vcs_url, |
131 | "layerdetailurl" : reverse('layerdetails', args=(prj.id,x.pk)), | 131 | "layerdetailurl" : reverse('layerdetails', args=(prj.id,x.pk)), |
132 | "revision" : x.get_vcs_reference(), | 132 | "revision" : x.get_vcs_reference(), |
@@ -718,7 +718,7 @@ def _get_dir_entries(build_id, target_id, start): | |||
718 | resolved_id = o.sym_target_id | 718 | resolved_id = o.sym_target_id |
719 | resolved_path = o.path | 719 | resolved_path = o.path |
720 | if target_packages.count(): | 720 | if target_packages.count(): |
721 | while resolved_id != "" and resolved_id != None: | 721 | while resolved_id != "" and resolved_id is not None: |
722 | tf = Target_File.objects.get(pk=resolved_id) | 722 | tf = Target_File.objects.get(pk=resolved_id) |
723 | resolved_path = tf.path | 723 | resolved_path = tf.path |
724 | resolved_id = tf.sym_target_id | 724 | resolved_id = tf.sym_target_id |
@@ -730,10 +730,10 @@ def _get_dir_entries(build_id, target_id, start): | |||
730 | entry['package_id'] = str(p.id) | 730 | entry['package_id'] = str(p.id) |
731 | entry['package'] = p.name | 731 | entry['package'] = p.name |
732 | # don't use resolved path from above, show immediate link-to | 732 | # don't use resolved path from above, show immediate link-to |
733 | if o.sym_target_id != "" and o.sym_target_id != None: | 733 | if o.sym_target_id != "" and o.sym_target_id is not None: |
734 | entry['link_to'] = Target_File.objects.get(pk=o.sym_target_id).path | 734 | entry['link_to'] = Target_File.objects.get(pk=o.sym_target_id).path |
735 | entry['size'] = filtered_filesizeformat(o.size) | 735 | entry['size'] = filtered_filesizeformat(o.size) |
736 | if entry['link_to'] != None: | 736 | if entry['link_to'] is not None: |
737 | entry['permission'] = node_str[o.inodetype] + o.permission | 737 | entry['permission'] = node_str[o.inodetype] + o.permission |
738 | else: | 738 | else: |
739 | entry['permission'] = node_str[o.inodetype] + o.permission | 739 | entry['permission'] = node_str[o.inodetype] + o.permission |
@@ -755,7 +755,7 @@ def dirinfo(request, build_id, target_id, file_path=None): | |||
755 | objects = _get_dir_entries(build_id, target_id, '/') | 755 | objects = _get_dir_entries(build_id, target_id, '/') |
756 | packages_sum = Package.objects.filter(id__in=Target_Installed_Package.objects.filter(target_id=target_id).values('package_id')).aggregate(Sum('installed_size')) | 756 | packages_sum = Package.objects.filter(id__in=Target_Installed_Package.objects.filter(target_id=target_id).values('package_id')).aggregate(Sum('installed_size')) |
757 | dir_list = None | 757 | dir_list = None |
758 | if file_path != None: | 758 | if file_path is not None: |
759 | """ | 759 | """ |
760 | Link from the included package detail file list page and is | 760 | Link from the included package detail file list page and is |
761 | requesting opening the dir info to a specific file path. | 761 | requesting opening the dir info to a specific file path. |
@@ -1029,15 +1029,15 @@ def _get_package_dependency_count(package, target_id, is_installed): | |||
1029 | 1029 | ||
1030 | def _get_package_alias(package): | 1030 | def _get_package_alias(package): |
1031 | alias = package.installed_name | 1031 | alias = package.installed_name |
1032 | if alias != None and alias != '' and alias != package.name: | 1032 | if alias is not None and alias != '' and alias != package.name: |
1033 | return alias | 1033 | return alias |
1034 | else: | 1034 | else: |
1035 | return '' | 1035 | return '' |
1036 | 1036 | ||
1037 | def _get_fullpackagespec(package): | 1037 | def _get_fullpackagespec(package): |
1038 | r = package.name | 1038 | r = package.name |
1039 | version_good = package.version != None and package.version != '' | 1039 | version_good = package.version is not None and package.version != '' |
1040 | revision_good = package.revision != None and package.revision != '' | 1040 | revision_good = package.revision is not None and package.revision != '' |
1041 | if version_good or revision_good: | 1041 | if version_good or revision_good: |
1042 | r += '_' | 1042 | r += '_' |
1043 | if version_good: | 1043 | if version_good: |
diff --git a/bitbake/lib/toaster/toastermain/management/commands/buildimport.py b/bitbake/lib/toaster/toastermain/management/commands/buildimport.py index 9af54ec2f2..3e246fda83 100644 --- a/bitbake/lib/toaster/toastermain/management/commands/buildimport.py +++ b/bitbake/lib/toaster/toastermain/management/commands/buildimport.py | |||
@@ -505,7 +505,7 @@ class Command(BaseCommand): | |||
505 | default_release = Release.objects.get(id=1) | 505 | default_release = Release.objects.get(id=1) |
506 | 506 | ||
507 | # SANITY: if 'reconfig' but project does not exist (deleted externally), switch to 'import' | 507 | # SANITY: if 'reconfig' but project does not exist (deleted externally), switch to 'import' |
508 | if ("reconfigure" == options['command']) and (None == project): | 508 | if ("reconfigure" == options['command']) and project is None: |
509 | options['command'] = 'import' | 509 | options['command'] = 'import' |
510 | 510 | ||
511 | # 'Configure': | 511 | # 'Configure': |