commit 17414e8ca8360ee3f4225a4d271b84d34b1c4eba
author Jack Rosenthal <jrosenth@chromium.org> Fri May 12 13:18:03 2023 -0600
committer Chromeos LUCI <chromeos-scoped@luci-project-accounts.iam.gserviceaccount.com> Sat May 13 00:21:35 2023 +0000
tree 848f920302ab7e799f68855e6eeeeff3f9c57428
parent b0d3c8fbcdd0d0107c38b6e2e88d4b6622adbd84

scripts: setup_board: Remove some deprecated flags

These flags have no other references in the tree, and are a
low-hanging fruit to remove.

Also fixed a couple of string formattings while I was here.

BUG=b:187786448
TEST=CQ

Change-Id: I9fc77dd11a290dc1290964a7506d35ddd00dec7f
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/chromite/+/4528595
Tested-by: Jack Rosenthal <jrosenth@chromium.org>
Auto-Submit: Jack Rosenthal <jrosenth@chromium.org>
Reviewed-by: Sergey Frolov <sfrolov@google.com>
Commit-Queue: Jack Rosenthal <jrosenth@chromium.org>

scripts/setup_board.py

diff --git a/scripts/setup_board.py b/scripts/setup_board.py
index b2b5516..07a89bd 100644
--- a/scripts/setup_board.py
+++ b/scripts/setup_board.py
@@ -67,11 +67,6 @@
     advanced.add_argument(
         "--accept-licenses", help="Licenses to append to the accept list."
     )
-    advanced.add_argument(
-        "--accept_licenses",
-        deprecated=deprecated % "--accept-licenses",
-        help="Deprecated form of --accept-licenses.",
-    )
 
     # Build target related arguments.
     target = parser.add_argument_group("Advanced Build Target Options")
@@ -82,12 +77,6 @@
     )
     target.add_argument("--variant", help="Board variant.")
     target.add_argument("--board-root", type="path", help="Board root.")
-    target.add_argument(
-        "--board_root",
-        type="path",
-        deprecated=deprecated % "--board-root",
-        help="Deprecated form of --board-root.",
-    )
 
     # Arguments related to the build itself.
     build = parser.add_argument_group("Advanced Build Modification Options")
@@ -104,13 +93,6 @@
         "modifying profiles without rebuild).",
     )
     build.add_argument(
-        "--regen_configs",
-        action="store_true",
-        default=False,
-        deprecated=deprecated % "--regen-configs",
-        help="Deprecated form of --regen-configs.",
-    )
-    build.add_argument(
         "--quiet",
         action="store_true",
         default=False,
@@ -133,7 +115,7 @@
         "--skip-chroot-upgrade",
         action="store_true",
         default=False,
-        help="Don't run the chroot upgrade automatically; " "use with care.",
+        help="Don't run the chroot upgrade automatically; use with care.",
     )
     build.add_argument(
         "--skip_chroot_upgrade",
@@ -150,26 +132,11 @@
         "the board root.",
     )
     build.add_argument(
-        "--skip_board_pkg_init",
-        action="store_true",
-        default=False,
-        deprecated=deprecated % "--skip-board-pkg-init",
-        help="Deprecated form of --skip-board-pkg-init.",
-    )
-    build.add_argument(
         "--reuse-pkgs-from-local-boards",
         dest="reuse_local",
         action="store_true",
         default=False,
-        help="Bootstrap from local packages instead of remote " "packages.",
-    )
-    build.add_argument(
-        "--reuse_pkgs_from_local_boards",
-        dest="reuse_local",
-        action="store_true",
-        default=False,
-        deprecated=deprecated % "--reuse-pkgs-from-local-boards",
-        help="Deprecated form of --reuse-pkgs-from-local-boards.",
+        help="Bootstrap from local packages instead of remote packages.",
     )
     build.add_argument(
         "--backtrack",