summaryrefslogtreecommitdiffstats
path: root/pym/portage/tests/emerge
diff options
context:
space:
mode:
authorZac Medico <zmedico@gentoo.org>2011-12-13 20:24:35 -0800
committerZac Medico <zmedico@gentoo.org>2011-12-13 20:24:35 -0800
commit89bcc67e2930a841e1120492634ebc20530bc1d7 (patch)
tree72354b816b5117a8b522f5bf338f728c0606cf2d /pym/portage/tests/emerge
parent9fa915eef028c96b8cde3876fb8bb299c03f9a62 (diff)
downloadportage-89bcc67e2930a841e1120492634ebc20530bc1d7.tar.gz
portage-89bcc67e2930a841e1120492634ebc20530bc1d7.tar.bz2
portage-89bcc67e2930a841e1120492634ebc20530bc1d7.zip
locks.py: fix hardlink locks for bug #394195
This updates the hardlink locking code to support the non-blocking, lockfile(wantnewlockfile=False), and lockfile(file_object) behaviors which are used by portage code.
Diffstat (limited to 'pym/portage/tests/emerge')
-rw-r--r--pym/portage/tests/emerge/test_simple.py4
1 files changed, 4 insertions, 0 deletions
diff --git a/pym/portage/tests/emerge/test_simple.py b/pym/portage/tests/emerge/test_simple.py
index a3efa62ca..86919509d 100644
--- a/pym/portage/tests/emerge/test_simple.py
+++ b/pym/portage/tests/emerge/test_simple.py
@@ -318,6 +318,10 @@ pkg_preinst() {
"PYTHONPATH" : pythonpath,
}
+ if "__PORTAGE_TEST_HARDLINK_LOCKS" in os.environ:
+ env["__PORTAGE_TEST_HARDLINK_LOCKS"] = \
+ os.environ["__PORTAGE_TEST_HARDLINK_LOCKS"]
+
updates_dir = os.path.join(portdir, "profiles", "updates")
dirs = [cachedir, cachedir_pregen, distdir, fake_bin,
portage_tmpdir, updates_dir,