summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorZac Medico <zmedico@gentoo.org>2006-06-27 09:23:32 +0000
committerZac Medico <zmedico@gentoo.org>2006-06-27 09:23:32 +0000
commitb9e0c406460200fc0d42252071de06e8b2b50d2b (patch)
tree38e38813e6f8c0696cb7389d1c4226dc6312d939
parent8724f02706d417d1ce27d3596bd3d293e0a190a3 (diff)
downloadportage-b9e0c406460200fc0d42252071de06e8b2b50d2b.tar.gz
portage-b9e0c406460200fc0d42252071de06e8b2b50d2b.tar.bz2
portage-b9e0c406460200fc0d42252071de06e8b2b50d2b.zip
Fix action_search() parameters for bug #138131.
svn path=/main/trunk/; revision=3673
-rwxr-xr-xbin/emerge5
1 files changed, 3 insertions, 2 deletions
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,