From: Zac Medico Date: Wed, 26 Nov 2008 23:52:46 +0000 (-0000) Subject: For bug #235642, include the stat mode, uid, and gid bits in the hardlink key. X-Git-Tag: v2.2_rc17~22 X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=e24b9cac102dd04b7a73f80900e7895a7b82a665;p=portage.git For bug #235642, include the stat mode, uid, and gid bits in the hardlink key. svn path=/main/trunk/; revision=12113 --- 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 = []