]> git.itanic.dy.fi Git - emerge-timer/commitdiff
Fix a conflict in comparing emerge times
authorEsko Kokkonen <esko.kokkonen@gmail.com>
Thu, 4 Sep 2014 15:33:41 +0000 (18:33 +0300)
committerEsko Kokkonen <esko.kokkonen@gmail.com>
Thu, 4 Sep 2014 15:33:41 +0000 (18:33 +0300)
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

index 3bfc86141f938e23b008a1215f4025982d45ae0f..1d6ddf0111d72994daf32526ec8cd09480a04abd 100755 (executable)
@@ -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