summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexandru DAMIAN <alexandru.damian@intel.com>2013-11-14 10:52:58 +0000
committerAlexandru DAMIAN <alexandru.damian@intel.com>2013-11-15 12:16:58 +0000
commit6f9c4d9778f001dc2ef4064de9f713a1c33db627 (patch)
treea60fb49732288342548efa108984115151c9a5a3
parentf20de8ac9064f25388c3d00c272fd24e818ff441 (diff)
downloadpoky-6f9c4d9778f001dc2ef4064de9f713a1c33db627.tar.gz
bitbake: toaster: fix tasks showing as NoExec
Tasks without script type information showed by default as NoExec; this happens for all Prebuild or Covered tasks, as script type information comes only on TaskStarted event. Such a default value may drive confusion, as NoExec value should be reserved for the NoExec-flagged tasks. This patch adds a new default value named Unknown that will be used for all tasks that don't have script type information available. [YOCTO #5327] (Bitbake rev: ec6cac74290f0d4f5b60222019c23416b4b8e1ef) Signed-off-by: Alexandru DAMIAN <alexandru.damian@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--bitbake/lib/toaster/orm/models.py10
1 files changed, 6 insertions, 4 deletions
diff --git a/bitbake/lib/toaster/orm/models.py b/bitbake/lib/toaster/orm/models.py
index 53b9e3a024..f60d138fe9 100644
--- a/bitbake/lib/toaster/orm/models.py
+++ b/bitbake/lib/toaster/orm/models.py
@@ -74,11 +74,13 @@ class Task(models.Model):
74 (SSTATE_RESTORED, 'Restored'), # succesfully restored 74 (SSTATE_RESTORED, 'Restored'), # succesfully restored
75 ) 75 )
76 76
77 CODING_NOEXEC = 0 77 CODING_NA = 0
78 CODING_PYTHON = 1 78 CODING_NOEXEC = 1
79 CODING_SHELL = 2 79 CODING_PYTHON = 2
80 CODING_SHELL = 3
80 81
81 TASK_CODING = ( 82 TASK_CODING = (
83 (CODING_NA, 'N/A'),
82 (CODING_NOEXEC, 'NoExec'), 84 (CODING_NOEXEC, 'NoExec'),
83 (CODING_PYTHON, 'Python'), 85 (CODING_PYTHON, 'Python'),
84 (CODING_SHELL, 'Shell'), 86 (CODING_SHELL, 'Shell'),
@@ -110,7 +112,7 @@ class Task(models.Model):
110 task_name = models.CharField(max_length=100) 112 task_name = models.CharField(max_length=100)
111 source_url = models.FilePathField(max_length=255, blank=True) 113 source_url = models.FilePathField(max_length=255, blank=True)
112 work_directory = models.FilePathField(max_length=255, blank=True) 114 work_directory = models.FilePathField(max_length=255, blank=True)
113 script_type = models.IntegerField(choices=TASK_CODING, default=CODING_NOEXEC) 115 script_type = models.IntegerField(choices=TASK_CODING, default=CODING_NA)
114 line_number = models.IntegerField(default=0) 116 line_number = models.IntegerField(default=0)
115 disk_io = models.IntegerField(null=True) 117 disk_io = models.IntegerField(null=True)
116 cpu_usage = models.DecimalField(max_digits=6, decimal_places=2, null=True) 118 cpu_usage = models.DecimalField(max_digits=6, decimal_places=2, null=True)