From 324c62d5d517414ba7966bbd888919985bffa84e Mon Sep 17 00:00:00 2001 From: Zac Medico Date: Wed, 26 Nov 2008 23:56:08 +0000 Subject: For bug #235642, include the stat mode, uid, and gid bits in the hardlink key. (trunk r12113) svn path=/main/branches/2.1.6/; revision=12114 --- pym/portage/dbapi/vartree.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pym/portage/dbapi/vartree.py b/pym/portage/dbapi/vartree.py index b27f30fe3..c8a4870e1 100644 --- a/pym/portage/dbapi/vartree.py +++ b/pym/portage/dbapi/vartree.py @@ -2736,7 +2736,8 @@ class dblink(object): # whether config protection or not, we merge the new file the # same way. Unless moveme=0 (blocking directory) if moveme: - hardlink_key = (mymd5, mystat.st_size) + hardlink_key = (mymd5, mystat.st_size, + mystat.st_mode, mystat.st_uid, mystat.st_gid) hardlink_candidates = self._md5_merge_map.get(hardlink_key) if hardlink_candidates is None: hardlink_candidates = [] -- cgit v1.2.3-1-g7c22