]> git.itanic.dy.fi Git - emerge-timer/commitdiff
Fix possible error situations
authorEsko Kokkonen <esko.kokkonen@gmail.com>
Sat, 10 Sep 2011 11:10:41 +0000 (14:10 +0300)
committerEsko Kokkonen <esko.kokkonen@gmail.com>
Sat, 10 Sep 2011 11:10:41 +0000 (14:10 +0300)
emerge-timer.py

index 31aae32b8538b0c144b49cfe06a9914f6a8405be..d74fa5dd6ebb2627e4b1839cb5479db4dbbc0d11 100755 (executable)
@@ -57,13 +57,24 @@ class package:
     def print_current_emerge(self):
 
         print("\t" + green_start + self.name + '-' + self.version +
-              color_stop + "\n\t current time: " + self.time(self.emerge_time)
-              + "\n\t average time: " + self.time(self.average_time())),
+              color_stop + "\n\t current time: " + self.time(self.emerge_time) +
+              "\n\t average time: "),
+
+        if len(self.versions) > 1:
+            print(self.time(self.average_time())),
+        else:
+            print("unknown"),
+
+        print("\n\t " + '-'*45),
 
         finish_time = self.average_time() - self.emerge_time
 
-        print("\n\t " + '-'*45 +
-              "\n\t time to finish: " + self.time(finish_time))
+        print("\n\t time to finish: "),
+
+        if finish_time > 0:
+            print(self.time(finish_time))
+        else:
+            print("any time now")
 
 
     def print_versions(self):
@@ -77,8 +88,12 @@ class package:
         print
 
     def print_pretended_times(self):
-        print("\t" + green_start + self.name + '-' + self.version +
-              color_stop + "\n\taverage time: " + self.time(self.average_time()))
+        print("\t" + green_start + self.name + '-' + self.version + color_stop),
+
+        if len(self.versions) > 1:
+            print("\n\taverage time: " + self.time(self.average_time()))
+        else:
+            print("\n\t no previous emerges")
 
 
     def print_min_max_ave(self):