Use _ENABLE_PRESERVE_LIBS and _ENABLE_DYN_LINK_MAP constants to control

instantiation of vardbapi._plib_registry and vardbapi._linkmap.

diff --git a/pym/portage/dbapi/vartree.py b/pym/portage/dbapi/vartree.py
index bda2d5145e2151c0eedbfc6a0e1243b396f20953..9c4355143335d491828e1ee90159f68f7269e8a9 100644 (file)
--- a/pym/portage/dbapi/vartree.py
+++ b/pym/portage/dbapi/vartree.py
@@ -33,6 +33,7 @@ portage.proxy.lazyimport.lazyimport(globals(),
 
 from portage.const import CACHE_PATH, CONFIG_MEMORY_FILE, \
        PORTAGE_PACKAGE_ATOM, PRIVATE_PATH, VDB_PATH
+from portage.const import _ENABLE_DYN_LINK_MAP, _ENABLE_PRESERVE_LIBS
 from portage.dbapi import dbapi
 from portage.exception import CommandNotFound, \
        InvalidData, InvalidPackageName, \
@@ -139,14 +140,19 @@ class vardbapi(dbapi):
                self._counter_path = os.path.join(self._eroot,
                        CACHE_PATH, "counter")
 
-               try:
-                       self._plib_registry = PreservedLibsRegistry(self._eroot,
-                               os.path.join(self._eroot, PRIVATE_PATH, "preserved_libs_registry"))
-               except PermissionDenied:
-                       # apparently this user isn't allowed to access PRIVATE_PATH
-                       self._plib_registry = None
+               self._plib_registry = None
+               if _ENABLE_PRESERVE_LIBS:
+                       try:
+                               self._plib_registry = PreservedLibsRegistry(self._eroot,
+                                       os.path.join(self._eroot, PRIVATE_PATH,
+                                       "preserved_libs_registry"))
+                       except PermissionDenied:
+                               # apparently this user isn't allowed to access PRIVATE_PATH
+                               pass
 
-               self._linkmap = LinkageMap(self)
+               self._linkmap = None
+               if _ENABLE_DYN_LINK_MAP:
+                       self._linkmap = LinkageMap(self)
                self._owners = self._owners_db(self)
 
        def getpath(self, mykey, filename=None):