Update prebuilt.py to filter Packages database.

prebuilt.py

 #!/usr/bin/python
 # 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.
 
 import datetime
 import multiprocessing
 import optparse
 import os
 import re
 import sys
+import tempfile
 
 from chromite.lib import cros_build_lib
 """
 This script is used to upload host prebuilts as well as board BINHOSTS to
 Google Storage.
 
 After a build is successfully uploaded a file is updated with the proper
 BINHOST version as well as the target board. This file is defined in GIT_FILE
 
 
@@ skipping 161 matching lines @@
     False otherwise.
   """
   for name in _FILTER_PACKAGES:
     if name in file_path:
       print 'FILTERING %s' % file_path
       return True
 
   return False
 
 
+def _ShouldFilterPackageFileSection(section):
+  """Return whether an section in the package file should be filtered out.
+
+  Args:
+    section: The section, as a list of strings.
+
+  Returns:
+    True if the section should be excluded.
+  """
+
+  for line in section:
+    if line.startswith("CPV: "):
+      package = line.replace("CPV: ", "").rstrip()
+      if ShouldFilterPackage(package):
+        return True
+  else:
+    return False
+
+
+def FilterPackagesFile(packages_filename):
+  """Read a portage Packages file and filter out private packages.
+
+  The new, filtered packages file is written to a temporary file.
+
+  Args:
+    packages_filename: The filename of the Packages file.
+
+  Returns:
+    filtered_packages: A filtered Packages file, as a NamedTemporaryFile.
+  """
+
+  packages_file = open(packages_filename)
+  filtered_packages = tempfile.NamedTemporaryFile()
+  section = []
+  for line in packages_file:
+    if line == "\n":
+      if not _ShouldFilterPackageFileSection(section):
+        # Looks like this section doesn't contain a private package. Write it
+        # out.
+        filtered_packages.write("".join(section))
+
+      # Start next section.
+      section = []
+
+    section.append(line)
+  else:
+    if not _ShouldFilterPackageFileSection(section):
+      filtered_packages.write("".join(section))
+  packages_file.close()
+
+  # Flush contents to disk.
+  filtered_packages.flush()
+  filtered_packages.seek(0)
+
+  return filtered_packages
+
+
 def _GsUpload(args):
   """Upload to GS bucket.
 
   Args:
     args: a tuple of two arguments that contains local_file and remote_file.
 
   Returns:
     Return the arg tuple of two if the upload failed
   """
   (local_file, remote_file) = args
   if ShouldFilterPackage(local_file):
     return
 
+  if local_file.endswith("/Packages"):
+    filtered_packages_file = FilterPackagesFile(local_file)
+    local_file = filtered_packages_file.name
+
   cmd = '%s cp -a public-read %s %s' % (_GSUTIL_BIN, local_file, remote_file)
   # TODO(scottz): port to use _Run or similar when it is available in
   # cros_build_lib.
   for attempt in range(_RETRIES):
     try:
       output = cros_build_lib.RunCommand(cmd, print_cmd=False, shell=True)
       break
     except cros_build_lib.RunCommandError:
       print 'Failed to sync %s -> %s, retrying' % (local_file, remote_file)
   else:
@@ skipping 175 matching lines @@
     UploadPrebuilt(options.build_path, options.upload, version,
                    git_sync=options.git_sync)
 
   if options.board:
     UploadPrebuilt(options.build_path, options.upload, version,
                    board=options.board, git_sync=options.git_sync)
 
 
 if __name__ == '__main__':
   main()