summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorZac Medico <zmedico@gentoo.org>2008-11-26 23:52:46 +0000
committerZac Medico <zmedico@gentoo.org>2008-11-26 23:52:46 +0000
commite24b9cac102dd04b7a73f80900e7895a7b82a665 (patch)
treef1be434b73fb127e914ee429145f54ff931e15cd
parent95040f85439934197e40a5f864d14206ec6b4a73 (diff)
downloadportage-e24b9cac102dd04b7a73f80900e7895a7b82a665.tar.gz
portage-e24b9cac102dd04b7a73f80900e7895a7b82a665.tar.bz2
portage-e24b9cac102dd04b7a73f80900e7895a7b82a665.zip
For bug #235642, include the stat mode, uid, and gid bits in the hardlink key.
svn path=/main/trunk/; revision=12113
-rw-r--r--pym/portage/dbapi/vartree.py3
1 files changed, 2 insertions, 1 deletions
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 = []