From fc7834e165bdf7d94de25cdee8e509eacbb67b49 Mon Sep 17 00:00:00 2001 From: Esko Kokkonen Date: Tue, 29 Nov 2011 18:31:42 +0200 Subject: [PATCH] Don't crash if we can't calculate current emerge time If we encounter an emerge time which for some reason we cannot calculate (or something weird happens) printout only 'unknown' --- emerge-timer.py | 20 ++++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-) diff --git a/emerge-timer.py b/emerge-timer.py index aa15f2f..4fc6c2d 100755 --- a/emerge-timer.py +++ b/emerge-timer.py @@ -80,18 +80,22 @@ class package: print(give_time(self.average_time())), else: - print("unknown"), + print(green_start + "unknown" + color_stop), print("\n\t " + '-'*45), - finish_time = self.average_time() - self.emerge_time - print("\n\t time to finish:"), - if finish_time > 0: - print(give_time(finish_time)) + if type(self.emerge_time) != str: + + finish_time = self.average_time() - self.emerge_time + + if finish_time > 0: + print(give_time(finish_time)) + else: + print(green_start + "any time now" + color_stop) else: - print(green_start + "any time now" + color_stop) + print(green_start + "unknown" + color_stop) print @@ -173,6 +177,10 @@ def give_time(time, nocolor=False): green_start = "" color_stop = "" + if type(time) == str: + return(green_start + "unknown" + color_stop) + + days = time/(3600*24) hours = (days - int(days))*24 minutes = (hours - int(hours))*60 -- 2.45.0