commit 8f0df7f55de4a3bc0ff5db31ccc50e721f19f3fd
author Gilad Arnold <garnold@chromium.org> Fri Jun 05 15:03:08 2015 -0700
committer ChromeOS Commit Bot <chromeos-commit-bot@chromium.org> Sun Jun 07 19:08:48 2015 +0000
tree cb15dc787d4ceec1b0976edae3ac32d734a917ab
parent 77c51619fb61e021e4cd4d026f19f1fe810621f9

strip_package: Strip multiple packages in one run.

This script uses builder.UpdateGmergeBinhost(), which does some
potentially heavyweight operations: load the Portage trees, filter
packages, and populate a binhost database. There are tools (e.g. cros
deploy) that call it multiple times, each time with an individual
package argument. To make things more efficient, this allows passing
multiple package arguments and processing them all in one run.

BUG=brillo:1132
TEST=strip_package --board link shill update_engine works as expected.

Change-Id: I53643e32a94b6ff85d8d0fa53cc179c09c38f0e6
Reviewed-on: https://chromium-review.googlesource.com/275723
Reviewed-by: Bertrand Simonnet <bsimonnet@chromium.org>
Commit-Queue: Gilad Arnold <garnold@chromium.org>
Tested-by: Gilad Arnold <garnold@chromium.org>

builder.py

diff --git a/builder.py b/builder.py
index a102280..454ac96 100644
--- a/builder.py
+++ b/builder.py
@@ -102,8 +102,8 @@
   xpak.tbz2(out_path).recompose_mem(my_xpak)
 
 
-def UpdateGmergeBinhost(sysroot, pkg, deep):
-  """Add pkg to our gmerge-specific binhost.
+def UpdateGmergeBinhost(sysroot, pkgs, deep):
+  """Add packages to our gmerge-specific binhost.
 
   Files matching DEFAULT_INSTALL_MASK are not included in the tarball.
   """
@@ -130,16 +130,20 @@
                                          settings=bintree.settings)
   gmerge_tree.populate()
 
+  gmerge_matches = set()
+  bindb_matches = set()
+  installed_matches = set()
   if deep:
     # If we're in deep mode, fill in the binhost completely.
-    gmerge_matches = set(gmerge_tree.dbapi.cpv_all())
-    bindb_matches = set(bintree.dbapi.cpv_all())
-    installed_matches = set(vardb.cpv_all()) & bindb_matches
+    gmerge_matches.update(gmerge_tree.dbapi.cpv_all())
+    bindb_matches.update(bintree.dbapi.cpv_all())
+    installed_matches.update(set(vardb.cpv_all()) & bindb_matches)
   else:
     # Otherwise, just fill in the requested package.
-    gmerge_matches = set(gmerge_tree.dbapi.match(pkg))
-    bindb_matches = set(bintree.dbapi.match(pkg))
-    installed_matches = set(vardb.match(pkg)) & bindb_matches
+    for pkg in pkgs:
+      gmerge_matches.update(gmerge_tree.dbapi.match(pkg))
+      bindb_matches.update(bintree.dbapi.match(pkg))
+      installed_matches.update(set(vardb.match(pkg)) & bindb_matches)
 
   # Remove any stale packages that exist in the local binhost but are not
   # installed anymore.
@@ -234,7 +238,7 @@
 
       # Sync gmerge binhost.
       deep = additional_args.get('deep')
-      if not UpdateGmergeBinhost(sysroot, pkg, deep):
+      if not UpdateGmergeBinhost(sysroot, [pkg], deep):
         return self.SetError('Package %s is not installed' % pkg)
 
       return 'Success\n'