From: Zac Medico <zmedico@gentoo.org>
Date: Thu, 13 Nov 2008 19:00:15 +0000 (-0000)
Subject: Remove --search set matching support.
X-Git-Tag: v2.1.6_rc1~82
X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=8148a3ff3c708a0c734f385f77141a63415cf534;p=portage.git

Remove --search set matching support.

svn path=/main/branches/2.1.6/; revision=11888
---

diff --git a/pym/_emerge/__init__.py b/pym/_emerge/__init__.py
index 9d94ac953..e03948539 100644
--- a/pym/_emerge/__init__.py
+++ b/pym/_emerge/__init__.py
@@ -566,10 +566,10 @@ class search(object):
 		self.packagematches = []
 		if self.searchdesc:
 			self.searchdesc=1
-			self.matches = {"pkg":[], "desc":[], "set":[]}
+			self.matches = {"pkg":[], "desc":[]}
 		else:
 			self.searchdesc=0
-			self.matches = {"pkg":[], "set":[]}
+			self.matches = {"pkg":[]}
 		print "Searching...   ",
 
 		regexsearch = False
@@ -615,21 +615,6 @@ class search(object):
 				if self.searchre.search(full_desc):
 					self.matches["desc"].append([full_package,masked])
 
-		self.sdict = self.setconfig.getSets()
-		for setname in self.sdict:
-			self.spinner.update()
-			if match_category:
-				match_string = setname
-			else:
-				match_string = setname.split("/")[-1]
-			
-			if self.searchre.search(match_string):
-				self.matches["set"].append([setname, False])
-			elif self.searchdesc:
-				if self.searchre.search(
-					self.sdict[setname].getMetadata("DESCRIPTION")):
-					self.matches["set"].append([setname, False])
-			
 		self.mlen=0
 		for mtype in self.matches:
 			self.matches[mtype].sort()
@@ -656,10 +641,6 @@ class search(object):
 				elif mtype == "desc":
 					full_package = match
 					match        = portage.cpv_getkey(match)
-				elif mtype == "set":
-					print green("*")+"  "+white(match)
-					print "     ", darkgreen("Description:")+"  ", self.sdict[match].getMetadata("DESCRIPTION")
-					print
 				if full_package:
 					try:
 						desc, homepage, license = self.portdb.aux_get(