Index: pym/portage/dbapi/bintree.py =================================================================== --- pym/portage/dbapi/bintree.py (revision 12746) +++ pym/portage/dbapi/bintree.py (revision 12749) @@ -703,7 +703,7 @@ for cpv in self._remotepkgs: self.dbapi.cpv_inject(cpv) self.populated = 1 - if getbinpkgsonly: + if True: # Remote package instances override local package # if they are not identical. hash_names = ["SIZE"] + self._pkgindex_hashes @@ -725,6 +725,9 @@ break if identical: del self._remotepkgs[cpv] + else: + # Override the local package in the aux_get cache. + self.dbapi._aux_cache[cpv] = remote_metadata else: # Local package instances override remote instances. for cpv in metadata: