[bitbake-devel] [PATCH 23/23] toaster: toastergui: code formatting and clean-up
Ed Bartosh
ed.bartosh at linux.intel.com
Fri Jan 15 11:01:06 UTC 2016
From: Elliot Smith <elliot.smith at intel.com>
Minor fixes to code formatting and small improvements from
code review.
Signed-off-by: Elliot Smith <elliot.smith at intel.com>
Signed-off-by: Ed Bartosh <ed.bartosh at linux.intel.com>
---
lib/toaster/orm/models.py | 12 +++---------
lib/toaster/toastergui/tables.py | 4 +++-
lib/toaster/toastergui/views.py | 5 ++---
3 files changed, 8 insertions(+), 13 deletions(-)
diff --git a/lib/toaster/orm/models.py b/lib/toaster/orm/models.py
index 3dc4d6d..ac2aa9e 100644
--- a/lib/toaster/orm/models.py
+++ b/lib/toaster/orm/models.py
@@ -477,15 +477,9 @@ class Build(models.Model):
targets in this build
"""
targets = self.target_set.all()
- target_labels = []
- target_label = None
-
- for target in targets:
- target_label = target.target
- if target.task:
- target_label = target_label + ':' + target.task
- target_labels.append(target_label)
-
+ target_labels = [target.target +
+ (':' + target.task if target.task else '')
+ for target in targets]
target_labels.sort()
return target_labels
diff --git a/lib/toaster/toastergui/tables.py b/lib/toaster/toastergui/tables.py
index 2279731..e9f1fdc 100644
--- a/lib/toaster/toastergui/tables.py
+++ b/lib/toaster/toastergui/tables.py
@@ -688,7 +688,9 @@ class ProjectsTable(ToasterTable):
self.queryset = queryset
- # columns: last activity on (updated) - DEFAULT, project (name), release, machine, number of builds, last build outcome, recipe (name), errors, warnings, image files
+ # columns: last activity on (updated) - DEFAULT, project (name), release,
+ # machine, number of builds, last build outcome, recipe (name), errors,
+ # warnings, image files
def setup_columns(self, *args, **kwargs):
name_template = '''
{% load project_url_tag %}
diff --git a/lib/toaster/toastergui/views.py b/lib/toaster/toastergui/views.py
index 4f7b50f..59e16b2 100755
--- a/lib/toaster/toastergui/views.py
+++ b/lib/toaster/toastergui/views.py
@@ -462,7 +462,7 @@ def builddashboard( request, build_id ):
for t in tgts:
elem = { }
elem[ 'target' ] = t
- if ( t.is_image ):
+ if t.is_image:
hasImages = True
npkg = 0
pkgsz = 0
@@ -481,8 +481,7 @@ def builddashboard( request, build_id ):
ndx = 0;
f = i.file_name[ ndx + 1: ]
imageFiles.append({ 'id': i.id, 'path': f, 'size' : i.file_size })
- if ( t.is_image and
- (( len( imageFiles ) <= 0 ) or ( len( t.license_manifest_path ) <= 0 ))):
+ if t.is_image and (len(imageFiles) <= 0 or len(t.license_manifest_path) <= 0):
targetHasNoImages = True
elem[ 'imageFiles' ] = imageFiles
elem[ 'targetHasNoImages' ] = targetHasNoImages
--
2.1.4
More information about the bitbake-devel
mailing list