config: lazy VirtualsManager instantiation

diff --git a/pym/portage/package/ebuild/config.py b/pym/portage/package/ebuild/config.py
index 046ec465f51fee6715f0e0a2a9c122716830dbf1..21fc1d52970296522664814891fd616d53c76a2a 100644 (file)
--- a/pym/portage/package/ebuild/config.py
+++ b/pym/portage/package/ebuild/config.py
@@ -271,7 +271,9 @@ class config(object):
                        #all LicenseManager instances.
                        self._license_manager = clone._license_manager
 
-                       self._virtuals_manager = copy.deepcopy(clone._virtuals_manager)
+                       # force instantiation of lazy objects when cloning, so
+                       # that they're not instantiated more than once
+                       self._virtuals_manager_obj = copy.deepcopy(clone._virtuals_manager)
 
                        self._accept_properties = copy.deepcopy(clone._accept_properties)
                        self._ppropertiesdict = copy.deepcopy(clone._ppropertiesdict)
@@ -282,6 +284,7 @@ class config(object):
                        # lazily instantiated objects
                        self._keywords_manager_obj = None
                        self._mask_manager_obj = None
+                       self._virtuals_manager_obj = None
 
                        locations_manager = LocationsManager(config_root=config_root,
                                config_profile_path=config_profile_path, eprefix=eprefix,
@@ -601,8 +604,6 @@ class config(object):
                                self._license_manager.extract_global_changes( \
                                        self.configdict["conf"].get("ACCEPT_LICENSE", ""))
 
-                       self._virtuals_manager = VirtualsManager(self.profiles)
-
                        if local_config:
                                #package.properties
                                propdict = grabdict_package(os.path.join(
@@ -902,6 +903,12 @@ class config(object):
                                strict_umatched_removal=self._unmatched_removal)
                return self._mask_manager_obj
 
+       @property
+       def _virtuals_manager(self):
+               if self._virtuals_manager_obj is None:
+                       self._virtuals_manager_obj = VirtualsManager(self.profiles)
+               return self._virtuals_manager_obj
+
        @property
        def pkeywordsdict(self):
                result = self._keywords_manager.pkeywordsdict.copy()