From: Zac Medico Date: Wed, 26 Nov 2008 23:56:08 +0000 (-0000) Subject: For bug #235642, include the stat mode, uid, and gid bits in the hardlink key. X-Git-Tag: v2.1.6_rc2~2 X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=324c62d5d517414ba7966bbd888919985bffa84e;p=portage.git 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 --- 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 = []