Add support for --usepkg and --usepkgonly options together with

emerge --search.

svn path=/main/trunk/; revision=9038

diff --git a/pym/_emerge/__init__.py b/pym/_emerge/__init__.py
index ad391e94acc7cfa8f17b02c1c53b1984baf171d0..c905504a421c52477fd72b4b214f27bf25745181 100644 (file)
--- a/pym/_emerge/__init__.py
+++ b/pym/_emerge/__init__.py
@@ -398,7 +398,7 @@ class search(object):
        # public interface
        #
        def __init__(self, root_config, spinner, searchdesc,
-               verbose):
+               verbose, usepkg, usepkgonly):
                """Searches the available and installed packages for the supplied search key.
                The list of available and installed packages is created at object instantiation.
                This makes successive searches faster."""
@@ -422,10 +422,10 @@ class search(object):
                bindb = root_config.trees["bintree"].dbapi
                vardb = root_config.trees["vartree"].dbapi
 
-               if portdb._have_root_eclass_dir:
+               if not usepkgonly and portdb._have_root_eclass_dir:
                        self._dbs.append(portdb)
 
-               if bindb.cp_all():
+               if (usepkg or usepkgonly) and bindb.cp_all():
                        self._dbs.append(bindb)
 
                self._dbs.append(vardb)
@@ -6117,7 +6117,8 @@ def action_search(root_config, myopts, myfiles, spinner):
        else:
                searchinstance = search(root_config,
                        spinner, "--searchdesc" in myopts,
-                       "--quiet" not in myopts)
+                       "--quiet" not in myopts, "--usepkg" in myopts,
+                       "--usepkgonly" in myopts)
                for mysearch in myfiles:
                        try:
                                searchinstance.execute(mysearch)