From e24b9cac102dd04b7a73f80900e7895a7b82a665 Mon Sep 17 00:00:00 2001 From: Zac Medico Date: Wed, 26 Nov 2008 23:52:46 +0000 Subject: [PATCH] For bug #235642, include the stat mode, uid, and gid bits in the hardlink key. svn path=/main/trunk/; revision=12113 --- 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 90e7a8693..152ec1aa6 100644 --- a/pym/portage/dbapi/vartree.py +++ b/pym/portage/dbapi/vartree.py @@ -3769,7 +3769,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 = [] -- 2.26.2