Use _prepare_env_file() to extract environment.bz2 prior to the

pkg_prerm phase. This fixes a regression since EbuildPhase no
longer calls doebuild(), and therefore _prepare_env_file() needs
to be called now.

diff --git a/pym/portage/dbapi/vartree.py b/pym/portage/dbapi/vartree.py
index 75784a69aecde0e06ef0e4d6d8a9c0a8408ca933..d9115318fc5ea1e2ca7db5d37d86269497c90188 100644 (file)
--- a/pym/portage/dbapi/vartree.py
+++ b/pym/portage/dbapi/vartree.py
@@ -15,7 +15,8 @@ portage.proxy.lazyimport.lazyimport(globals(),
        'portage.elog:elog_process',
        'portage.locks:lockdir,unlockdir',
        'portage.output:bold,colorize',
-       'portage.package.ebuild.doebuild:doebuild,doebuild_environment',
+       'portage.package.ebuild.doebuild:doebuild,doebuild_environment,' + \
+               '_prepare_env_file',
        'portage.package.ebuild.prepare_build_dirs:prepare_build_dirs',
        'portage.update:fixdbentries',
        'portage.util:apply_secpass_permissions,ConfigProtect,ensure_dirs,' + \
@@ -2193,6 +2194,7 @@ class dblink(object):
                                        catdir_lock = None
 
                                prepare_build_dirs(self.myroot, self.settings, 1)
+                               _prepare_env_file(self.settings)
                                log_path = self.settings.get("PORTAGE_LOG_FILE")
 
                                if scheduler is None: