From 249b3ef17a6fe93fda79cbabf2d51234310473cb Mon Sep 17 00:00:00 2001 From: Esko Kokkonen Date: Thu, 4 Sep 2014 18:33:41 +0300 Subject: [PATCH] Fix a conflict in comparing emerge times First look for the string indicating infinity and if this is not found, then continue to the actual time comparisons. This was probably broken in python3 -> python2 upgrade. --- emerge-timer.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/emerge-timer.py b/emerge-timer.py index 3bfc861..1d6ddf0 100755 --- a/emerge-timer.py +++ b/emerge-timer.py @@ -495,8 +495,8 @@ def list_emerge_processes(): timestamp = datetime.datetime.fromtimestamp(time) difference = (now - timestamp).total_seconds() - if ((difference < p.emerge_time) or - (p.emerge_time == "infinity")): + if ((p.emerge_time == "infinity") or + (difference < p.emerge_time)): p.emerge_time = difference -- 2.45.0