commit e998970a7c8c80d7a5294d099f6e27414f88b0ca
author Andrew Wilson <apwilson@google.com> Fri May 18 17:12:58 2018 -0700
committer Andrew Wilson <anwilson@google.com> Wed May 23 17:11:01 2018 +0000
tree 9d1727e8cbd285882c21286ec449a87d87b79843
parent bda26e88e3273b01a046a434ad44cbfd483efe89

[verify_layer] Remove buildbot as optional and make required.

BLD-161

Change-Id: I2be0246a7fc1ac4e62baf3210c8309fbcf8e8b78

packages/verify_layer.py

diff --git a/packages/verify_layer.py b/packages/verify_layer.py
index ded12ec..fe3e173 100755
--- a/packages/verify_layer.py
+++ b/packages/verify_layer.py
@@ -15,16 +15,12 @@
 
 # Standard names for root packages in a layer.
 ROOT_CANONICAL_PACKAGES = [
+    'buildbot',
     'default',
     'dev',
     'kitchen_sink',
 ]
 
-# Standard names for optional root packages in a layer.
-ROOT_OPTIONAL_PACKAGES = [
-    'buildbot',
-]
-
 # Standard names for packages in a layer.
 CANONICAL_PACKAGES = [
     'all',
@@ -105,7 +101,7 @@
                 return False
             return True
         for file in filenames:
-            if is_root and (file in ROOT_CANONICAL_PACKAGES or file in ROOT_OPTIONAL_PACKAGES or file == layer):
+            if is_root and (file in ROOT_CANONICAL_PACKAGES or file == layer):
                 continue
             if file in CANONICAL_PACKAGES or file in NON_PACKAGE_FILES:
                 continue