Fix bug 10466: parallel_emerge use flag calculation favors local binhost.

parallel_emerge

 #!/usr/bin/python2.6
 # Copyright (c) 2010 The Chromium OS Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 """Program to run emerge in parallel, for significant speedup.
 
 Usage:
  ./parallel_emerge [--board=BOARD] [--workon=PKGS] [--no-workon-deps]
                    [--force-remote-binary=PKGS] [emerge args] package
@@ skipping 1174 matching lines @@
           remote_ready = PrebuiltsReady(pkg, remote_pkgs, remote_ready_cache)
           if remote_ready and (local_mtime <= remote_mtime or pkg in cycles):
             MergeChildren(pkg, "mandatory")
           else:
             MergeChildren(pkg, "mandatory_source")
 
     def UsePrebuiltPackages(remote_pkgs):
       """Update packages that can use prebuilts to do so."""
       start = time.time()
 
-      # The bintree is the database of binary packages. By default, it's
-      # empty.
-      bintree = emerge.trees[root]["bintree"]
-      bindb = bintree.dbapi
-      root_config = emerge.root_config
-      pkgsettings = emerge.depgraph._frozen_config.pkgsettings[root]
+      # Build list of prebuilt packages
       prebuilt_pkgs = {}
-
-      # Populate the DB with packages
-      bintree.populate("--getbinpkg" in emerge.opts,
-                       "--getbinpkgonly" in emerge.opts)
-
-      # Build list of prebuilt packages
       for pkg, info in deps_map.iteritems():
         if info and info["action"] == "merge":
           if (not info["force_remote_binary"] and info["mandatory_source"] or
               "--usepkgonly" not in emerge.opts and pkg not in remote_pkgs):
             continue
 
-          db_keys = list(bindb._aux_cache_keys)
-          try:
-            db_vals = bindb.aux_get(pkg, db_keys + ["MTIME"])
-          except KeyError:
-            # No binary package
-            continue
-
-          mtime = int(db_vals.pop() or 0)
-          metadata = zip(db_keys, db_vals)
-          db_pkg = Package(built=True, cpv=pkg, installed=False,
-                           metadata=metadata, onlydeps=False, mtime=mtime,
-                           operation="merge", root_config=root_config,
-                           type_name="binary")
+          db_pkg = emerge.depgraph._pkg(pkg, "binary", emerge.root_config)
+          if info["force_remote_binary"]:
+            # Undo our earlier hacks to the use flags so that the use flags
+            # display correctly.
+            db_pkg.use.enabled = db_pkg.metadata["USE"].split()
           prebuilt_pkgs[pkg] = db_pkg
 
       # Calculate what packages need to be rebuilt due to changes in use flags.
+      pkgsettings = emerge.depgraph._frozen_config.pkgsettings[root]
       for pkg, db_pkg in prebuilt_pkgs.iteritems():
         if not self.CheckUseFlags(pkgsettings, db_pkg, self.package_db[pkg]):
           MergeChildren(pkg, "mandatory_source")
 
       # Convert eligible packages to binaries.
       for pkg, info in deps_map.iteritems():
         if info and info["action"] == "merge" and pkg in prebuilt_pkgs:
           if not info["mandatory_source"] or info["force_remote_binary"]:
             self.package_db[pkg] = prebuilt_pkgs[pkg]
 
@@ skipping 654 matching lines @@
   # need to upgrade the rest of the packages. So we'll go ahead and do that.
   if portage_upgrade:
     args = sys.argv[1:] + ["--nomerge=sys-apps/portage"]
     os.execvp(os.path.realpath(sys.argv[0]), args)
 
   print "Done"
   sys.exit(0)
 
 if __name__ == "__main__":
   main()