diff options
| author | Zac Medico <zmedico@gentoo.org> | 2010-08-18 12:26:19 -0700 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2010-08-18 12:26:19 -0700 |
| commit | bd2ce49c7481927ee9aea6744ce67397cc3bf8fd (patch) | |
| tree | ff95ba7d49ef2a93b57688c28b8888c252872b63 | |
| parent | ba283624d5e607deffb9b5849ea4890ef773e739 (diff) | |
| download | portage-bd2ce49c7481927ee9aea6744ce67397cc3bf8fd.tar.gz portage-bd2ce49c7481927ee9aea6744ce67397cc3bf8fd.tar.bz2 portage-bd2ce49c7481927ee9aea6744ce67397cc3bf8fd.zip | |
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.
| -rw-r--r-- | pym/portage/dbapi/vartree.py | 4 |
1 files changed, 3 insertions, 1 deletions
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: |