]> git.itanic.dy.fi Git - emerge-timer/commitdiff
Be more verbose if found more than one package with the same name
authorEsko Kokkonen <esko.kokkonen@gmail.com>
Mon, 13 Jun 2011 16:22:49 +0000 (19:22 +0300)
committerEsko Kokkonen <esko.kokkonen@gmail.com>
Mon, 13 Jun 2011 16:22:49 +0000 (19:22 +0300)
Try to list the possible packages the user might have intented.

emerge-timer.py

index 05bf826b89356b73dc0c0a9e5f3fa758fd2c4041..6d40c19c94dcd14ed731ab08f9e7d485c5cf20e0 100755 (executable)
@@ -89,16 +89,28 @@ def date_printer(package, time1, time2):
 def get_package(name):
     global package
     dirlist = os.listdir(PORTDIR)
+    possible_package = []
 
     for i in dirlist:
         directory = PORTDIR + i
         if os.path.isdir(directory):
             dirs = os.listdir(directory)
             if name in dirs:
-                package = i + '/' + name
-                return
+                possible_package.append(i + '/' + name)
+
+    if len(possible_package) > 1:
+        print("Multiple packages found for '" + name + "'.")
+        print("Possible packages: ")
+        for value in possible_package:
+            print("\t" + value)
+
+    elif len(possible_package) == 1:
+        package = possible_package[0]
+        return
+
+    else:
+        print("No package '" + name + "' found")
 
-    print("No package '" + name + "' found")
     sys.exit(1)