]> git.itanic.dy.fi Git - emerge-timer/commitdiff
Remove useless variable
authorEsko Kokkonen <esko.kokkonen@gmail.com>
Thu, 18 Aug 2011 14:49:19 +0000 (17:49 +0300)
committerEsko Kokkonen <esko.kokkonen@gmail.com>
Thu, 18 Aug 2011 14:54:30 +0000 (17:54 +0300)
emerge_number is not needed because the length of the list 'times'
posesses the same information.

emerge-timer.py

index b30190f05420ebf1d389cf4856f65cb14f3a7c20..a4ed730975de57d304d751ac2fe77e5a8e00f8b4 100755 (executable)
@@ -8,7 +8,6 @@ PORTDIR = "/usr/portage/"
 LOGFILE = "/var/log/emerge.log"
 
 
-emerge_number = 0
 times = []
 
 
@@ -188,11 +187,11 @@ def print_times(package, times, silent):
 
     # This should be True if we're in current emerge stage
     if silent == True:
-        if emerge_number == 0:
+        if len(times) == 0:
             print("\t  no previous emerges found for this package\n")
             return 0
 
-        elif emerge_number == 1:
+        elif len(times) == 1:
             print("\t  previous emerge time"),
             organize_times(times[0][0])
             print("(only one emerge previously)\n")
@@ -210,12 +209,12 @@ def print_times(package, times, silent):
         return all_times/len(times)
 
 
-    if emerge_number == 1:
+    if len(times) == 1:
         print(green_start + package + color_stop + " emerged once")
 
-    else:
+    elif len(times) > 1:
         print(green_start + package + color_stop + " emerged " + green_start +
-              str(emerge_number) + color_stop + " times\n")
+              str(len(times)) + color_stop + " times\n")
 
         print "Max time:\t",
         organize_times(times[0][0])
@@ -352,8 +351,6 @@ def list_pretended(f):
 def main_loop(f, package, silent):
     """The main loop which parses the LOGFILE and if needed prints out emerge times."""
 
-    global emerge_number
-    emerge_number = 0
     f.seek(0) # Seek to the beginning of the file
 
 
@@ -374,9 +371,6 @@ def main_loop(f, package, silent):
 
                     try:
                         if (":::" in line) and ("completed emerge" in line):
-                            emerge_number += 1
-
-
                             time_string = line.partition(":::")
                             time2 = float(time_string[0].strip().strip(":"))
 
@@ -407,8 +401,6 @@ def main_loop(f, package, silent):
 def main(status):
     """Change between current emerge stage and normal operating stage."""
 
-    global emerge_number
-
     f = open_log()
 
     if status == 'current':
@@ -426,7 +418,7 @@ def main(status):
 
     main_loop(f, package, False)
 
-    if emerge_number == 0:
+    if len(times) == 0:
         print("Package '" + package + "' has never been emerged")
         sys.exit(1)