From 2c239afad567e73d961bac0f92488698f2513aac Mon Sep 17 00:00:00 2001 From: Zac Medico Date: Thu, 27 Oct 2011 09:31:33 -0700 Subject: Run pkg_pretend in PORTAGE_TMPDIR for bug #388593 --- pym/_emerge/Scheduler.py | 3 ++- pym/portage/tests/emerge/test_simple.py | 5 +++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/pym/_emerge/Scheduler.py b/pym/_emerge/Scheduler.py index bc85a0d26..224408322 100644 --- a/pym/_emerge/Scheduler.py +++ b/pym/_emerge/Scheduler.py @@ -915,8 +915,9 @@ class Scheduler(PollScheduler): root_config = x.root_config settings = self.pkgsettings[root_config.root] settings.setcpv(x) - tmpdir = tempfile.mkdtemp() tmpdir_orig = settings["PORTAGE_TMPDIR"] + build_prefix_orig = os.path.join(tmpdir_orig, 'portage') + tmpdir = tempfile.mkdtemp(dir=build_prefix_orig) settings["PORTAGE_TMPDIR"] = tmpdir try: diff --git a/pym/portage/tests/emerge/test_simple.py b/pym/portage/tests/emerge/test_simple.py index 271911537..4110b5577 100644 --- a/pym/portage/tests/emerge/test_simple.py +++ b/pym/portage/tests/emerge/test_simple.py @@ -29,6 +29,11 @@ class SimpleEmergeTestCase(TestCase): install_something = """ S="${WORKDIR}" + +pkg_pretend() { + einfo "called pkg_pretend for $CATEGORY/$PF" +} + src_install() { einfo "installing something..." # TODO: Add prefix support to shell code/helpers, so we -- cgit v1.2.3-1-g7c22