From: Zac Medico Date: Mon, 19 Jun 2006 21:28:07 +0000 (-0000) Subject: To prevent infinite recursion when a lock file has more than 1 hardlink, test for... X-Git-Tag: v2.1.1~458 X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=442b511530e65a45949dfc66236197116aa53850;p=portage.git To prevent infinite recursion when a lock file has more than 1 hardlink, test for exactly 0 hardlinks before recursing. svn path=/main/trunk/; revision=3540 --- diff --git a/pym/portage_locks.py b/pym/portage_locks.py index 4c7da6d31..027399a02 100644 --- a/pym/portage_locks.py +++ b/pym/portage_locks.py @@ -121,7 +121,7 @@ def lockfile(mypath,wantnewlockfile=0,unlinkfile=0): if type(lockfilename) == types.StringType and \ - myfd != HARDLINK_FD and os.fstat(myfd).st_nlink != 1: + myfd != HARDLINK_FD and os.fstat(myfd).st_nlink == 0: # The file was deleted on us... Keep trying to make one... os.close(myfd) portage_util.writemsg("lockfile recurse\n",1)