summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorZac Medico <zmedico@gentoo.org>2006-02-26 12:05:36 +0000
committerZac Medico <zmedico@gentoo.org>2006-02-26 12:05:36 +0000
commitfb6d749e4472da7d139ffd5598be0ca4ec6727eb (patch)
tree0f51ec3da172c8b4e06423987494c0b21ed5ee03
parente2e0cc661a2c3978a54e9a4b9ae90e04f17f36c5 (diff)
downloadportage-fb6d749e4472da7d139ffd5598be0ca4ec6727eb.tar.gz
portage-fb6d749e4472da7d139ffd5598be0ca4ec6727eb.tar.bz2
portage-fb6d749e4472da7d139ffd5598be0ca4ec6727eb.zip
Fix 'Bad file descriptor' error with hardlink locking for bug 124140.
svn path=/main/trunk/; revision=2790
-rw-r--r--pym/portage_locks.py3
1 files changed, 2 insertions, 1 deletions
diff --git a/pym/portage_locks.py b/pym/portage_locks.py
index f108cba2e..9f4bdaa34 100644
--- a/pym/portage_locks.py
+++ b/pym/portage_locks.py
@@ -122,7 +122,8 @@ def lockfile(mypath,wantnewlockfile=0,unlinkfile=0):
raise
- if type(lockfilename) == types.StringType and os.fstat(myfd).st_nlink != 1:
+ if type(lockfilename) == types.StringType and \
+ myfd != HARDLINK_FD and os.fstat(myfd).st_nlink != 1:
# The file was deleted on us... Keep trying to make one...
os.close(myfd)
portage_util.writemsg("lockfile recurse\n",1)