commit 7f0e198cd2b78d1a98240ad5dacf6acfc6d43d1a
author Mike Frysinger <vapier@chromium.org> Tue Sep 12 17:08:50 2017 -0400
committer chrome-bot <chrome-bot@chromium.org> Thu Sep 14 18:01:50 2017 -0700
tree f98cf73f98801ea21b0ee1ec4dc98b1852e1a858
parent c289d8c038b6574d479edd82b5642b3c8c6a4f21

cros_setup_toolchains: drop support for disabling packages

This has only ever been used to disable some packages that were added
implicitly to the host toolchain, and those were only there because we
were forcing the host packages through crossdev code paths.  Now that
we've rewritten/simplified the host toolchain paths, this code is all
dead, so punt it.

BUG=chromium:751852
TEST=precqs pass
TEST=`cbuildbot chromiumos-sdk` passes

Change-Id: I094e9543c3e6da814ef5228c8d4c14b4f0c26d9f
Reviewed-on: https://chromium-review.googlesource.com/666558
Commit-Ready: Mike Frysinger <vapier@chromium.org>
Tested-by: Mike Frysinger <vapier@chromium.org>
Reviewed-by: Manoj Gupta <manojgupta@chromium.org>

scripts/cros_setup_toolchains.py

diff --git a/scripts/cros_setup_toolchains.py b/scripts/cros_setup_toolchains.py
index b08cf25..1c8f47b 100644
--- a/scripts/cros_setup_toolchains.py
+++ b/scripts/cros_setup_toolchains.py
@@ -35,7 +35,6 @@
 
 EMERGE_CMD = os.path.join(constants.CHROMITE_BIN_DIR, 'parallel_emerge')
 PACKAGE_STABLE = '[stable]'
-PACKAGE_NONE = '[none]'
 
 CHROMIUMOS_OVERLAY = '/usr/local/portage/chromiumos'
 ECLASS_OVERLAY = '/usr/local/portage/eclass-overlay'
@@ -339,11 +338,6 @@
   return '%s/%s' % (category, pn)
 
 
-def IsPackageDisabled(target, package):
-  """Returns if the given package is not used for the target."""
-  return GetDesiredPackageVersions(target, package) == [PACKAGE_NONE]
-
-
 def PortageTrees(root):
   """Return the portage trees for a given root."""
   if root == '/':
@@ -410,7 +404,7 @@
   for version in versions:
     if version == PACKAGE_STABLE:
       resolved.append(GetStablePackageVersion(atom, installed, root=root))
-    elif version != PACKAGE_NONE:
+    else:
       resolved.append(version)
   return resolved
 
@@ -460,9 +454,8 @@
     for package in GetTargetPackages(target):
       atom = GetPortagePackage(target, package)
       # Do we even want this package && is it initialized?
-      if not IsPackageDisabled(target, package) and not (
-          GetStablePackageVersion(atom, True) and
-          GetStablePackageVersion(atom, False)):
+      if not (GetStablePackageVersion(atom, True) and
+              GetStablePackageVersion(atom, False)):
         return False
     return True
   except cros_build_lib.RunCommandError:
@@ -543,22 +536,15 @@
     RemovePackageMask(target)
     for package in GetTargetPackages(target):
       # Portage name for the package
-      if IsPackageDisabled(target, package):
-        logging.debug('   Skipping disabled package %s', package)
-        continue
-      logging.debug('   Updating package %s', package)
+      logging.debug('   Checking package %s', package)
       pkg = GetPortagePackage(target, package)
       current = GetInstalledPackageVersions(pkg, root=root)
       desired = GetDesiredPackageVersions(target, package)
       desired_num = VersionListToNumeric(target, package, desired, False)
       mergemap[pkg] = set(desired_num).difference(current)
+      logging.debug('      %s -> %s', current, desired_num)
 
-  packages = []
-  for pkg in mergemap:
-    for ver in mergemap[pkg]:
-      if ver != PACKAGE_NONE:
-        packages.append(pkg)
-
+  packages = [pkg for pkg, vers in mergemap.items() if vers]
   if not packages:
     logging.info('Nothing to update!')
     return False
@@ -588,9 +574,6 @@
   for target in targets:
     logging.debug('Cleaning target %s', target)
     for package in GetTargetPackages(target):
-      if IsPackageDisabled(target, package):
-        logging.debug('   Skipping disabled package %s', package)
-        continue
       logging.debug('   Cleaning package %s', package)
       pkg = GetPortagePackage(target, package)
       current = GetInstalledPackageVersions(pkg, root=root)