From: Zac Medico <zmedico@gentoo.org>
Date: Thu, 14 Sep 2006 07:44:54 +0000 (-0000)
Subject: Simplify portage_locks.hardlink_is_mine() so that it only checks the number of links... 
X-Git-Tag: v2.1.1-r1~81
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=6acf6754e6c512119f236efedf21e1233b75be7c;p=portage.git

Simplify portage_locks.hardlink_is_mine() so that it only checks the number of links.  Nothing more is needed.

svn path=/main/trunk/; revision=4448
---

diff --git a/pym/portage_locks.py b/pym/portage_locks.py
index 98ccab8ae..77169906c 100644
--- a/pym/portage_locks.py
+++ b/pym/portage_locks.py
@@ -193,19 +193,9 @@ def hardlink_active(lock):
 
 def hardlink_is_mine(link,lock):
 	try:
-		myhls = os.stat(link)
-		mylfs = os.stat(lock)
+		return os.stat(link).st_nlink == 2
 	except OSError:
-		myhls = None
-		mylfs = None
-
-	if myhls:
-		if myhls[stat.ST_NLINK] == 2:
-			return True
-		if mylfs:
-			if mylfs[stat.ST_INO] == myhls[stat.ST_INO]:
-				return True
-	return False
+		return False
 
 def hardlink_lockfile(lockfilename, max_wait=14400):
 	"""Does the NFS, hardlink shuffle to ensure locking on the disk.