diff options
| author |   Greg Turner <gmturner007@ameritech.net> | 2012-04-17 18:48:32 -0700 |
|---|---|---|
| committer |   Zac Medico <zmedico@gentoo.org> | 2012-04-17 18:48:32 -0700 |
| commit | 5bd8b8a41326d16d4e8347bcddfee0d4ff8f6bd3 (patch) | |
| tree | e64b22d37bb352f691b7c99137aca880cf3989a0 /pym/portage/dbapi | |
| parent | Avoid redundant news display for bug #412161. (diff) | |
| download | portage-5bd8b8a41326d16d4e8347bcddfee0d4ff8f6bd3.tar.gz portage-5bd8b8a41326d16d4e8347bcddfee0d4ff8f6bd3.tar.bz2 portage-5bd8b8a41326d16d4e8347bcddfee0d4ff8f6bd3.zip | |
mergeme: cleanup hardlink_candidates, bug #412453
Diffstat (limited to 'pym/portage/dbapi')
| -rw-r--r-- | pym/portage/dbapi/vartree.py | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/pym/portage/dbapi/vartree.py b/pym/portage/dbapi/vartree.py index 25ea4c189..a3a6c76ad 100644 --- a/pym/portage/dbapi/vartree.py +++ b/pym/portage/dbapi/vartree.py @@ -1452,7 +1452,7 @@ class dblink(object): self._contents_inodes = None self._contents_basenames = None self._linkmap_broken = False - self._md5_merge_map = {} + self._hardlink_merge_map = {} self._hash_key = (self._eroot, self.mycpv) self._protect_obj = None self._pipe = pipe @@ -4500,10 +4500,10 @@ class dblink(object): # as hardlinks (having identical st_dev and st_ino). hardlink_key = (mystat.st_dev, mystat.st_ino) - hardlink_candidates = self._md5_merge_map.get(hardlink_key) + hardlink_candidates = self._hardlink_merge_map.get(hardlink_key) if hardlink_candidates is None: hardlink_candidates = [] - self._md5_merge_map[hardlink_key] = hardlink_candidates + self._hardlink_merge_map[hardlink_key] = hardlink_candidates mymtime = movefile(mysrc, mydest, newmtime=thismtime, sstat=mystat, mysettings=self.settings, @@ -4511,8 +4511,7 @@ class dblink(object): encoding=_encodings['merge']) if mymtime is None: return 1 - if hardlink_candidates is not None: - hardlink_candidates.append(mydest) + hardlink_candidates.append(mydest) zing = ">>>" if mymtime != None: |