diff options
| author |   Zac Medico <zmedico@gentoo.org> | 2008-11-26 23:56:08 +0000 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2008-11-26 23:56:08 +0000 |
| commit | 324c62d5d517414ba7966bbd888919985bffa84e (patch) | |
| tree | 39d7578f03686e8e64f33095d6eae64a5e2b3bb3 | |
| parent | In movefile(), ignore the hardlink_candidates parameter when it's an empty list. (diff) | |
| download | portage-324c62d5d517414ba7966bbd888919985bffa84e.tar.gz portage-324c62d5d517414ba7966bbd888919985bffa84e.tar.bz2 portage-324c62d5d517414ba7966bbd888919985bffa84e.zip | |
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
| -rw-r--r-- | pym/portage/dbapi/vartree.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/pym/portage/dbapi/vartree.py b/pym/portage/dbapi/vartree.py index b27f30fe3..c8a4870e1 100644 --- 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 = [] |