mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-05-31 00:39:46 +00:00
Code Issues Projects Releases Wiki Activity

bitbake: lib: amend code to use proper singleton comparisons where possible

Browse Source 
amend the code to handle singleton comparisons properly so it only checks
if they only refer to the same object or not, and not bother
comparing the values.

(Bitbake rev: b809a6812aa15a8a9af97bc382cc4b19571e6bfc)

Signed-off-by: Frazer Clews <frazer.clews@codethink.co.uk>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Frazer Clews
2020-01-16 17:11:19 +00:00
committed by Richard Purdie
parent 0ac5174c7d
commit fa5524890e
28 changed files with 65 additions and 65 deletions
Download Patch File Download Diff File Expand all files Collapse all files
bitbake/lib/toaster/toastergui/templatetags/projecttags.py
+2 -2
View File
@@ -212,7 +212,7 @@ def filtered_installedsize(size, installed_size):
"""If package.installed_size not null and not empty return it,
else return package.size
"""
return size if (installed_size == 0) or (installed_size == "") or (installed_size == None) else installed_size
return size if (installed_size == 0) or (installed_size == "") or (installed_size is None) else installed_size
@register.filter
def filtered_packageversion(version, revision):
@@ -228,7 +228,7 @@ def filter_sizeovertotal(package_object, total_size):
formatted nicely.
"""
size = package_object.installed_size
if size == None or size == '':
if size is None or size == '':
size = package_object.size
return '{:.1%}'.format(float(size)/float(total_size))
bitbake/lib/toaster/toastergui/views.py
+9 -9
View File
@@ -51,7 +51,7 @@ class MimeTypeFinder(object):
def get_mimetype(self, path):
guess = mimetypes.guess_type(path, self._strict)
guessed_type = guess[0]
if guessed_type == None:
if guessed_type is None:
guessed_type = 'application/octet-stream'
return guessed_type
@@ -126,7 +126,7 @@ def _lv_to_dict(prj, x = None):
return {"id": x.pk,
"name": x.layer.name,
"tooltip": "%s | %s" % (x.layer.vcs_url,x.get_vcs_reference()),
"detail": "(%s" % x.layer.vcs_url + (")" if x.release == None else " | "+x.get_vcs_reference()+")"),
"detail": "(%s" % x.layer.vcs_url + (")" if x.release is None else " | "+x.get_vcs_reference()+")"),
"giturl": x.layer.vcs_url,
"layerdetailurl" : reverse('layerdetails', args=(prj.id,x.pk)),
"revision" : x.get_vcs_reference(),
@@ -718,7 +718,7 @@ def _get_dir_entries(build_id, target_id, start):
resolved_id = o.sym_target_id
resolved_path = o.path
if target_packages.count():
while resolved_id != "" and resolved_id != None:
while resolved_id != "" and resolved_id is not None:
tf = Target_File.objects.get(pk=resolved_id)
resolved_path = tf.path
resolved_id = tf.sym_target_id
@@ -730,10 +730,10 @@ def _get_dir_entries(build_id, target_id, start):
entry['package_id'] = str(p.id)
entry['package'] = p.name
# don't use resolved path from above, show immediate link-to
if o.sym_target_id != "" and o.sym_target_id != None:
if o.sym_target_id != "" and o.sym_target_id is not None:
entry['link_to'] = Target_File.objects.get(pk=o.sym_target_id).path
entry['size'] = filtered_filesizeformat(o.size)
if entry['link_to'] != None:
if entry['link_to'] is not None:
entry['permission'] = node_str[o.inodetype] + o.permission
else:
entry['permission'] = node_str[o.inodetype] + o.permission
@@ -755,7 +755,7 @@ def dirinfo(request, build_id, target_id, file_path=None):
objects = _get_dir_entries(build_id, target_id, '/')
packages_sum = Package.objects.filter(id__in=Target_Installed_Package.objects.filter(target_id=target_id).values('package_id')).aggregate(Sum('installed_size'))
dir_list = None
if file_path != None:
if file_path is not None:
"""
Link from the included package detail file list page and is
requesting opening the dir info to a specific file path.
@@ -1029,15 +1029,15 @@ def _get_package_dependency_count(package, target_id, is_installed):
def _get_package_alias(package):
alias = package.installed_name
if alias != None and alias != '' and alias != package.name:
if alias is not None and alias != '' and alias != package.name:
return alias
else:
return ''
def _get_fullpackagespec(package):
r = package.name
version_good = package.version != None and package.version != ''
revision_good = package.revision != None and package.revision != ''
version_good = package.version is not None and package.version != ''
revision_good = package.revision is not None and package.revision != ''
if version_good or revision_good:
r += '_'
if version_good: