Only populate the binarytree for actions that need it (search or

install actions).

diff --git a/pym/_emerge/main.py b/pym/_emerge/main.py
index 16d9897de74fe9da21842c45b81e30a786461f67..b2bb362f8f94abdd0f6bcc37c6ed45d5b96f6874 100644 (file)
--- a/pym/_emerge/main.py
+++ b/pym/_emerge/main.py
@@ -1336,7 +1336,8 @@ def emerge_main():
                # Freeze the portdbapi for performance (memoize all xmatch results).
                mydb.freeze()
 
-               if "--usepkg" in myopts:
+               if myaction in ('search', None) and \
+                       "--usepkg" in myopts:
                        # Populate the bintree with current --getbinpkg setting.
                        # This needs to happen before expand_set_arguments(), in case
                        # any sets use the bintree.