diff options
| author | Zac Medico <zmedico@gentoo.org> | 2009-01-09 11:19:07 +0000 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2009-01-09 11:19:07 +0000 |
| commit | 1a9726b31cc0326ede10a45b02294931d1db7473 (patch) | |
| tree | a5367a5884f593c245e336f02d909411a2568ad1 /pym/_emerge | |
| parent | 6afefabfb5f442a6844cf60664bf0516f661106d (diff) | |
| download | portage-1a9726b31cc0326ede10a45b02294931d1db7473.tar.gz portage-1a9726b31cc0326ede10a45b02294931d1db7473.tar.bz2 portage-1a9726b31cc0326ede10a45b02294931d1db7473.zip | |
Make die() to show a message indicating the repository that an ebuild came
from, and do it during any phase for both ebuilds and binary packages. Now
PORTAGE_REPO_NAME is initialized inside config.setcpv() for both ebuilds
and binary packages, so it's always available inside ebuild.sh.
svn path=/main/trunk/; revision=12402
Diffstat (limited to 'pym/_emerge')
| -rw-r--r-- | pym/_emerge/__init__.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/pym/_emerge/__init__.py b/pym/_emerge/__init__.py index 8b7143c16..c2bc09acc 100644 --- a/pym/_emerge/__init__.py +++ b/pym/_emerge/__init__.py @@ -2521,9 +2521,8 @@ class EbuildBuild(CompositeTask): tree = "porttree" self._tree = tree portdb = root_config.trees[tree].dbapi - settings["EMERGE_FROM"] = pkg.type_name - settings.backup_changes("EMERGE_FROM") - settings.reset() + settings.setcpv(pkg) + settings.configdict["pkg"]["EMERGE_FROM"] = pkg.type_name ebuild_path = portdb.findname(self.pkg.cpv) self._ebuild_path = ebuild_path @@ -3206,6 +3205,7 @@ class Binpkg(CompositeTask): debug = settings.get("PORTAGE_DEBUG") == "1" portage.doebuild_environment(self._ebuild_path, "setup", settings["ROOT"], settings, debug, 1, self._bintree.dbapi) + settings.configdict["pkg"]["EMERGE_FROM"] = pkg.type_name # The prefetcher has already completed or it # could be running now. If it's running now, |