To prevent infinite recursion when a lock file has more than 1 hardlink, test for...

svn path=/main/trunk/; revision=3540

diff --git a/pym/portage_locks.py b/pym/portage_locks.py
index 4c7da6d31a77b7a685b3609562c81582582d289f..027399a023a473bc1697578ac13b887b48e21cfa 100644 (file)
--- 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)