]> git.itanic.dy.fi Git - emerge-timer/commitdiff
Fix current emerge_time calculations
authorEsko Kokkonen <esko.kokkonen@gmail.com>
Tue, 29 Nov 2011 16:33:21 +0000 (18:33 +0200)
committerEsko Kokkonen <esko.kokkonen@gmail.com>
Tue, 29 Nov 2011 16:33:21 +0000 (18:33 +0200)
Change where in the for loop we actually put the emerge time into the
packages classes emerge_time variable. This means we have to change
the place where the initial "infinity" time is given.

emerge-timer.py

index 4fc6c2dedc8493e9c334a85b7cb4b8723c70752a..e5c75c438009a4f825802408a7fbcd7395c57edb 100755 (executable)
@@ -22,7 +22,7 @@ class package:
         self.name = name
         self.version = version
         self.versions = []
-        self.emerge_time = 0
+        self.emerge_time = "infinity"
 
 
     def add_version(self, version, emerge_time, emerge_date):
@@ -387,21 +387,19 @@ def list_emerge_processes():
     for line in f:
         if ((">>>" in line) and ("emerge" in line)):
             for p in PACKAGES:
-                difference = "infinity"
-                new_difference = 0
+                difference = 0
 
                 if (p.name + '-' + p.version in line):
 
                     time = float(line.partition(' ')[0].strip(":"))
 
                     timestamp = datetime.datetime.fromtimestamp(time)
-                    new_difference = (now - timestamp).total_seconds()
+                    difference = (now - timestamp).total_seconds()
 
-                    if ((new_difference < difference) or
-                        (difference == "infinity")):
-                        difference = new_difference
+                    if ((difference < p.emerge_time) or
+                        (p.emerge_time == "infinity")):
 
-            p.emerge_time = difference
+                        p.emerge_time = difference
 
     return 0