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 90e7a8693db7908ed5703165d5f553109c72cd2a..152ec1aa6178cfcc60d31e81067cc11faebb0c7b 100644 (file)
--- 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 = []