diff options
| author | Zac Medico <zmedico@gentoo.org> | 2006-09-25 09:49:37 +0000 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2006-09-25 09:49:37 +0000 |
| commit | 81b2837ded9fac1853902044f6cba3e4d891c00a (patch) | |
| tree | 2f9bd8a1f2ebe6b618512a7719a16643bb667693 | |
| parent | a57319288f8edac3484b40b2d389d82177029ea9 (diff) | |
| download | portage-81b2837ded9fac1853902044f6cba3e4d891c00a.tar.gz portage-81b2837ded9fac1853902044f6cba3e4d891c00a.tar.bz2 portage-81b2837ded9fac1853902044f6cba3e4d891c00a.zip | |
For bug #149028, don't lock the tbz2 file because the filesytem could be readonly or shared by a cluster.
svn path=/main/trunk/; revision=4525
| -rw-r--r-- | pym/portage.py | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/pym/portage.py b/pym/portage.py index e4d95747e..0ea10737d 100644 --- a/pym/portage.py +++ b/pym/portage.py @@ -6559,7 +6559,9 @@ def pkgmerge(mytbz2, myroot, mysettings, mydbapi=None, vartree=None, prev_mtimes tbz2_lock = None builddir_lock = None try: - tbz2_lock = portage_locks.lockfile(mytbz2, wantnewlockfile=1) + """ Don't lock the tbz2 file because the filesytem could be readonly or + shared by a cluster.""" + #tbz2_lock = portage_locks.lockfile(mytbz2, wantnewlockfile=1) mypkg = os.path.basename(mytbz2)[:-5] xptbz2 = xpak.tbz2(mytbz2) @@ -6611,8 +6613,8 @@ def pkgmerge(mytbz2, myroot, mysettings, mydbapi=None, vartree=None, prev_mtimes if retval != os.EX_OK: writemsg("!!! Error Extracting '%s'\n" % mytbz2, noiselevel=-1) return None - portage_locks.unlockfile(tbz2_lock) - tbz2_lock = None + #portage_locks.unlockfile(tbz2_lock) + #tbz2_lock = None mylink = dblink(mycat, mypkg, myroot, mysettings, vartree=vartree, treetype="bintree") |