aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Wood <michael.g.wood@intel.com>2015-11-13 13:48:34 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-11-16 11:43:38 +0000
commita981700701c41c7bbb6a9778e95f691278c5c294 (patch)
treea0292b5618f4ee8acf57b51c2ec65ce688c599c2
parent4f700316933e8e7b2d27366e5ce6176895b913e7 (diff)
downloadbitbake-a981700701c41c7bbb6a9778e95f691278c5c294.tar.gz
toaster: orm Fix get_number_of_builds to count all apart from IN_PROGRESS
The count of a project's builds should not include those which are currently in progress. Signed-off-by: Michael Wood <michael.g.wood@intel.com> Signed-off-by: Elliot Smith <elliot.smith@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--lib/toaster/orm/models.py9
1 files changed, 4 insertions, 5 deletions
diff --git a/lib/toaster/orm/models.py b/lib/toaster/orm/models.py
index 383290583..0ac94b933 100644
--- a/lib/toaster/orm/models.py
+++ b/lib/toaster/orm/models.py
@@ -130,13 +130,12 @@ class Project(models.Model):
try:
return self.projectvariable_set.get(name="MACHINE").value
except (ProjectVariable.DoesNotExist,IndexError):
- return( "None" );
+ return None;
def get_number_of_builds(self):
- try:
- return len(Build.objects.filter( project = self.id ))
- except (Build.DoesNotExist,IndexError):
- return( 0 )
+ """Return the number of builds which have ended"""
+
+ return self.build_set.filter(~Q(outcome=Build.IN_PROGRESS)).count()
def get_last_build_id(self):
try: