diff options
| author |   Elliot Smith <elliot.smith@intel.com> | 2016-01-15 13:01:06 +0200 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-01-15 16:30:01 +0000 |
| commit | 798e8b8d03b78929a936c6ea01166209a747ca1f (patch) | |
| tree | 682683bdc9c6a3fbe4a8c0d5f7d7b5fb0ad135a8 /bitbake | |
| parent | c4b50111e9887c4d69f6a8b5fb50824fc44f7128 (diff) | |
| download | openembedded-core-contrib-798e8b8d03b78929a936c6ea01166209a747ca1f.tar.gz | |
bitbake: toastergui: code formatting and clean-up
Minor fixes to code formatting and small improvements from
code review.
(Bitbake rev: 2c97f3a5c6ae37de910deb90390c5b856a600c5f)
Signed-off-by: Elliot Smith <elliot.smith@intel.com>
Signed-off-by: Ed Bartosh <ed.bartosh@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'bitbake')
| -rw-r--r-- | bitbake/lib/toaster/orm/models.py | 12 | ||||
| -rw-r--r-- | bitbake/lib/toaster/toastergui/tables.py | 4 | ||||
| -rwxr-xr-x | bitbake/lib/toaster/toastergui/views.py | 5 |
3 files changed, 8 insertions, 13 deletions
diff --git a/bitbake/lib/toaster/orm/models.py b/bitbake/lib/toaster/orm/models.py index 3dc4d6d891..ac2aa9e469 100644 --- a/bitbake/lib/toaster/orm/models.py +++ b/bitbake/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/bitbake/lib/toaster/toastergui/tables.py b/bitbake/lib/toaster/toastergui/tables.py index 227973114c..e9f1fdccb1 100644 --- a/bitbake/lib/toaster/toastergui/tables.py +++ b/bitbake/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/bitbake/lib/toaster/toastergui/views.py b/bitbake/lib/toaster/toastergui/views.py index 4f7b50f9dc..59e16b27b2 100755 --- a/bitbake/lib/toaster/toastergui/views.py +++ b/bitbake/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 |