From: Zac Medico Date: Wed, 18 Aug 2010 19:26:19 +0000 (-0700) Subject: Use _prepare_env_file() to extract environment.bz2 prior to the X-Git-Tag: v2.2_rc68~103 X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=bd2ce49c7481927ee9aea6744ce67397cc3bf8fd;p=portage.git 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 75784a69a..d9115318f 100644 --- 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: