From d004be9f6535567fb24f7bfa342932c03562f188 Mon Sep 17 00:00:00 2001 From: Farrell Wymore Date: Fri, 23 May 2014 12:09:29 -0700 Subject: toaster: display message if no images are generated Display message if no images are generated for a target. This commit was amended to have more conditions for displaying the message. [YOCTO #6094] Signed-off-by: Farrell Wymore Signed-off-by: Richard Purdie --- lib/toaster/toastergui/templates/builddashboard.html | 15 +++++++++++++++ lib/toaster/toastergui/views.py | 5 +++++ 2 files changed, 20 insertions(+) diff --git a/lib/toaster/toastergui/templates/builddashboard.html b/lib/toaster/toastergui/templates/builddashboard.html index 9bd094ecc..f83ae083a 100644 --- a/lib/toaster/toastergui/templates/builddashboard.html +++ b/lib/toaster/toastergui/templates/builddashboard.html @@ -83,6 +83,19 @@
{{target.npkg}}
Total package size
{{target.pkgsz|filtered_filesizeformat}}
+ {% if target.targetHasNoImages %} +
+

+ This build did not create any image files +

+

+ This is probably because valid image and license manifest + files from a previous build already exist in your + .../poky/build/tmp/deploy directory. You can also view the + license manifest information in Toaster. +

+
+ {% else %}
License manifest @@ -100,10 +113,12 @@ {% endfor %} + {% endif %} {% endif %} {% endfor %} + {% endif %} diff --git a/lib/toaster/toastergui/views.py b/lib/toaster/toastergui/views.py index 6de448596..68e981a50 100755 --- a/lib/toaster/toastergui/views.py +++ b/lib/toaster/toastergui/views.py @@ -402,6 +402,7 @@ def builddashboard( request, build_id ): targets = [ ] ntargets = 0 hasImages = False + targetHasNoImages = False for t in tgts: elem = { } elem[ 'target' ] = t @@ -428,7 +429,11 @@ def builddashboard( request, build_id ): ndx = 0; f = i.file_name[ ndx + 1: ] imageFiles.append({ 'path': f, 'size' : i.file_size }) + if ( t.is_image and + (( len( imageFiles ) <= 0 ) or ( len( t.license_manifest_path ) <= 0 ))): + targetHasNoImages = True elem[ 'imageFiles' ] = imageFiles + elem[ 'targetHasNoImages' ] = targetHasNoImages targets.append( elem ) ## -- cgit 1.2.3-korg