From: Marius Mauch <genone@gentoo.org>
Date: Sat, 15 Jul 2006 01:27:15 +0000 (-0000)
Subject: disable regular expressions for search by default
X-Git-Tag: v2.1.1~229
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=fcf3fb91f4c98f98808f0cc86788006cfdf04695;p=portage.git

disable regular expressions for search by default

svn path=/main/trunk/; revision=3876
---

diff --git a/bin/emerge b/bin/emerge
index 34b3688d5..4d9c0342f 100755
--- a/bin/emerge
+++ b/bin/emerge
@@ -418,16 +418,17 @@ class search:
 			self.matches = {"pkg":[]}
 		print "Searching...   ",
 
+		regexsearch = False
+		if self.searchkey[0] == '%':
+			regexsearch = True
+			self.searchkey = self.searchkey[1:]
 		if self.searchkey[0] == '@':
 			match_category = 1
 			self.searchkey = self.searchkey[1:]
-		if self.searchkey=="*":
-			#hack for people who aren't regular expression gurus
-			self.searchkey==".*"
-		if re.search("\+\+", self.searchkey):
-			#hack for people who aren't regular expression gurus
-			self.searchkey=re.sub("\+\+","\+\+",self.searchkey)
-		self.searchre=re.compile(self.searchkey.lower(),re.I)
+		if regexsearch:
+			self.searchre=re.compile(self.searchkey,re.I)
+		else:
+			self.searchre=re.compile(re.escape(self.searchkey), re.I)
 		for package in self.portdb.cp_all():
 			self.spinner.update()