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 b27f30fe373ea37cd602815bb9abe3fd8b7c3cee..c8a4870e10578153a601bdc7a8bc5852cf623b2e 100644 (file)
--- 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 = []