From: Zac Medico <zmedico@gentoo.org>
Date: Tue, 27 Jun 2006 09:23:32 +0000 (-0000)
Subject: Fix action_search() parameters for bug #138131.
X-Git-Tag: v2.1.1~367
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=b9e0c406460200fc0d42252071de06e8b2b50d2b;p=portage.git

Fix action_search() parameters for bug #138131.

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

diff --git a/bin/emerge b/bin/emerge
index 41fb751cb..53a57f124 100755
--- a/bin/emerge
+++ b/bin/emerge
@@ -3089,7 +3089,7 @@ def action_info(myopts):
 			if "cvs_id_string" in dir(module):
 				print "%s: %s" % (str(x), str(module.cvs_id_string))
 
-def action_search(myopts, myfiles, spinner):
+def action_search(settings, vartree, myopts, myfiles, spinner):
 	if not myfiles:
 		print "emerge: no search terms provided."
 	else:
@@ -3795,7 +3795,8 @@ def emerge_main():
 	
 	# SEARCH action
 	elif "search"==myaction:
-		action_search(myopts, myfiles)
+		action_search(settings, trees["/"]["vartree"],
+			myopts, myfiles, spinner)
 	elif "unmerge"==myaction or "prune"==myaction or "clean"==myaction:
 		vartree = trees[settings["ROOT"]]["vartree"]
 		if 1 == unmerge(settings, myopts, vartree, myaction, myfiles,