From: Zac Medico <zmedico@gentoo.org>
Date: Mon, 30 Aug 2010 20:00:02 +0000 (-0700)
Subject: Use _ENABLE_PRESERVE_LIBS and _ENABLE_DYN_LINK_MAP constants to control
X-Git-Tag: v2.2_rc73~32
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=d3e181fd0b841f3205dfcc2711f0bd4f5faa80e5;p=portage.git

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 bda2d5145..9c4355143 100644
--- 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):