[patch] Patch against etcat

diff.txt (text/plain), 2.37 KB, created by Stuart Herbert (RETIRED) on 2003-07-28 11:02:18 UTC

--- etcat	2003-07-28 18:54:26.000000000 +0100
+++ /usr/bin/etcat	2003-07-26 12:34:40.000000000 +0100
@@ -6,7 +6,7 @@
 # 
 #  etcat v0.1.4 (27 Apr 2003)
 #
-#  $Header: /space/cvsroot/gentoo-x86/app-admin/gentoolkit/files/scripts/etcat,v 1.7 2003/06/13 07:41:25 liquidx Exp $
+#  $Header: /home/cvsroot/gentoo-x86/app-admin/gentoolkit/files/scripts/etcat,v 1.7 2003/06/13 07:41:25 liquidx Exp $
 #
 # --| About |--------------------------------------------------------
 #
@@ -88,8 +88,8 @@
 # .-------------------------------------------------------.
 # | Initialise Colour Settings                            |
 # `-------------------------------------------------------'
-if (not sys.stdout.isatty()) or (portage.settings["NOCOLOR"] in ["yes","true"]):
-    nocolor()
+#if (not sys.stdout.isatty()) or (portage.settings["NOCOLOR"] in ["yes","true"]):
+nocolor()
 
 # "option": ("shortcommand","desc",["example one", "example two"])
 options = {
@@ -990,16 +1000,19 @@
     # FIXME: use portage.settings
     dbdir = "/var/db/pkg/"
     
-    print "[ Results for search key : " + white(query) + " ]"
-    print "[ Applications found : " + white(str(len(matches))) + " ]"
-    print
+#    print "[ Results for search key : " + white(query) + " ]"
+#    print "[ Applications found : " + white(str(len(matches))) + " ]"
+#    print
     
-    if matches:
-	print " Only printing found installed programs."
-	print
-    else:
-	print "No packages found."
-	return
+    if len(matches) == 0:
+     	print "no matches found"
+	sys.exit(1)
+
+    if len(matches) > 1:
+     	print "found str(len(matches)) matches - narrow your search"
+	for package in matches:
+		print package
+	sys.exit(1)
     
     for package in matches:
 	if tup[2]:
@@ -1019,8 +1032,8 @@
 		    except:
 			# fail silently
 			continue
-		    print
-		    print yellow(" * ") + white("/".join(pkg.split("/")[-2:]))
+#		    print
+#		    print yellow(" * ") + white("/".join(pkg.split("/")[-2:]))
 		    for line in f.readlines():
 			words = line.split()
 			if len(words) < 2:
@@ -1033,7 +1046,10 @@
 			    print blue(words[1])
 			else:
 			    print words[1]
-
+	else:
+		print "found matching package '" + package + "',"
+		print "but it is not installed"
+		sys.exit(1)
 # .-------------------------------------------------------.
 # | Help Function                                         |
 # `-------------------------------------------------------'