| 1 |
Author: zmedico |
| 2 |
Date: 2008-11-26 23:56:08 +0000 (Wed, 26 Nov 2008) |
| 3 |
New Revision: 12114 |
| 4 |
|
| 5 |
Modified: |
| 6 |
main/branches/2.1.6/pym/portage/dbapi/vartree.py |
| 7 |
Log: |
| 8 |
For bug #235642, include the stat mode, uid, and gid bits in the hardlink key. |
| 9 |
(trunk r12113) |
| 10 |
|
| 11 |
|
| 12 |
Modified: main/branches/2.1.6/pym/portage/dbapi/vartree.py |
| 13 |
=================================================================== |
| 14 |
--- main/branches/2.1.6/pym/portage/dbapi/vartree.py 2008-11-26 23:52:46 UTC (rev 12113) |
| 15 |
+++ main/branches/2.1.6/pym/portage/dbapi/vartree.py 2008-11-26 23:56:08 UTC (rev 12114) |
| 16 |
@@ -2736,7 +2736,8 @@ |
| 17 |
# whether config protection or not, we merge the new file the |
| 18 |
# same way. Unless moveme=0 (blocking directory) |
| 19 |
if moveme: |
| 20 |
- hardlink_key = (mymd5, mystat.st_size) |
| 21 |
+ hardlink_key = (mymd5, mystat.st_size, |
| 22 |
+ mystat.st_mode, mystat.st_uid, mystat.st_gid) |
| 23 |
hardlink_candidates = self._md5_merge_map.get(hardlink_key) |
| 24 |
if hardlink_candidates is None: |
| 25 |
hardlink_candidates = [] |
Archives