Run pkg_pretend in PORTAGE_TMPDIR for bug #388593

diff --git a/pym/_emerge/Scheduler.py b/pym/_emerge/Scheduler.py
index bc85a0d261831079f043cae2f19a62873a73a784..224408322f8bc0fb963cb84543dc019d4f0b7f2b 100644 (file)
--- 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 271911537f942af917d73ba4c1ba7d2058975c4d..4110b5577e01912750db71a2a1bd61b82813aadd 100644 (file)
--- 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