Bug #261082 - Prefer remote package instances whenever --getbinpkg is enabled

(previously local instances were preferred unless --getbinpkgonly was enabled).
(trunk r12749)

svn path=/main/branches/2.1.6/; revision=12997

diff --git a/pym/portage/dbapi/bintree.py b/pym/portage/dbapi/bintree.py
index 9bd8eb92ef1d4a829df54a0fe1d77bfa7e7c558d..80d7765de3dd4cbb7ed075e0da2ea8418a4323d3 100644 (file)
--- a/pym/portage/dbapi/bintree.py
+++ b/pym/portage/dbapi/bintree.py
@@ -703,7 +703,7 @@ class binarytree(object):
                                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