From 376c03c53bc86b88f14ef46c036795eb52186805 Mon Sep 17 00:00:00 2001 From: Richard Ipsum Date: Thu, 19 Jun 2014 14:35:41 +0100 Subject: Fix job shower If our job hasn't ended then our query for (started, ended) returns the start time and NULL for the end time. With sqlite3 NULL maps to None. time.gmtime(None) returns the current time, so instead of displaying nothing a job that hasn't ended will display the current time as its ended time. --- lorrycontroller/showjob.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lorrycontroller/showjob.py b/lorrycontroller/showjob.py index 6f73ed6..951ad22 100644 --- a/lorrycontroller/showjob.py +++ b/lorrycontroller/showjob.py @@ -42,7 +42,7 @@ class JobShower(object): 'disk_usage_nice': self.format_bytesize(disk_usage), 'output': output, 'job_started': self.format_time(started), - 'job_ended': self.format_time(ended), + 'job_ended': '' if ended is None else self.format_time(ended), 'timestamp': self.format_time(now), } -- cgit v1.2.1