diff options
| author | Zac Medico <zmedico@gentoo.org> | 2008-04-10 06:15:24 +0000 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2008-04-10 06:15:24 +0000 |
| commit | 6b7b386399d73ab2ef619a846f8e29e9ea8fc7c6 (patch) | |
| tree | e8b6a520ecc71947b4c972f5a0201e9b5f4df658 /bin/emerge | |
| parent | 41014a373df44e858fbffc38b96cfc64b58bf035 (diff) | |
| download | portage-6b7b386399d73ab2ef619a846f8e29e9ea8fc7c6.tar.gz portage-6b7b386399d73ab2ef619a846f8e29e9ea8fc7c6.tar.bz2 portage-6b7b386399d73ab2ef619a846f8e29e9ea8fc7c6.zip | |
* Make depclean/prune use cached Package instances for visibility checks.
* Make FakeVartree wrap dbapi.match() to make sure the metadata in Package
instances gets updated for any cpv that is returned from a match()
call, since the metadata can be accessed directly from the Package instance
instead of via aux_get().
(trunk r9789)
svn path=/main/branches/2.1.2/; revision=9793
Diffstat (limited to 'bin/emerge')
| -rwxr-xr-x | bin/emerge | 22 |
1 files changed, 18 insertions, 4 deletions
diff --git a/bin/emerge b/bin/emerge index daab0e780..4501731db 100755 --- a/bin/emerge +++ b/bin/emerge @@ -1188,11 +1188,27 @@ class FakeVartree(portage.vartree): # being delayed in case cache generation is triggered. self._aux_get = self.dbapi.aux_get self.dbapi.aux_get = self._aux_get_wrapper + self._match = self.dbapi.match + self.dbapi.match = self._match_wrapper self._aux_get_history = set() self._portdb_keys = ["DEPEND", "RDEPEND", "PDEPEND"] self._portdb = portdb self._global_updates = None + def _match_wrapper(self, cpv, use_cache=1): + """ + Make sure the metadata in Package instances gets updated for any + cpv that is returned from a match() call, since the metadata can + be accessed directly from the Package instance instead of via + aux_get(). + """ + matches = self._match(cpv, use_cache=use_cache) + for cpv in matches: + if cpv in self._aux_get_history: + continue + self._aux_get_wrapper(cpv, []) + return matches + def _aux_get_wrapper(self, pkg, wants): if pkg in self._aux_get_history: return self._aux_get(pkg, wants) @@ -6688,10 +6704,8 @@ def action_depclean(settings, trees, ldpath_mtimes, # For consistency with the update algorithm, keep the highest # visible version and prune any versions that are old or masked. for cpv in reversed(pkgs): - metadata = dict(izip(metadata_keys, - vardb.aux_get(cpv, metadata_keys))) - if visible(settings, Package(built=True, cpv=cpv, - installed=True, metadata=metadata, type_name="installed")): + if visible(settings, + pkg_cache[("installed", myroot, cpv, "nomerge")]): pkgs = [cpv] break if len(pkgs) > 1: |