Fix mach run bustage (#33563)

Move `--flavor` to a new "Packaging options" group, so that
we can only apply the flavor option to the commands that support it.

Signed-off-by: Jonathan Schwender <schwenderjonathan@gmail.com>

1 files changed, 13 insertions, 5 deletions

diff --git a/python/servo/command_base.py b/python/servo/command_base.py
index 1436aa41379..1dcfe1e8408 100644
--- a/python/servo/command_base.py
+++ b/python/servo/command_base.py
@@ -515,7 +515,11 @@ class CommandBase(object):
         return env
 
     @staticmethod
-    def common_command_arguments(build_configuration=False, build_type=False, binary_selection=False):
+    def common_command_arguments(build_configuration=False,
+                                 build_type=False,
+                                 binary_selection=False,
+                                 package_configuration=False
+                                 ):
         decorators = []
         if build_type or binary_selection:
             decorators += [
@@ -532,10 +536,6 @@ class CommandBase(object):
                 CommandArgument('--profile', group="Build Type",
                                 help='Build with custom Cargo profile'),
                 CommandArgument('--with-asan', action='store_true', help="Build with AddressSanitizer"),
-                CommandArgument(
-                    '--flavor', default=None, group="Build Type",
-                    help='Product flavor to be used when packaging with Gradle/Hvigor (android/ohos).'
-                ),
             ]
 
         if build_configuration:
@@ -594,6 +594,14 @@ class CommandBase(object):
                     help="Enable Servo's `crown` linter tool"
                 )
             ]
+        if package_configuration:
+            decorators += [
+                CommandArgumentGroup('Packaging options'),
+                CommandArgument(
+                    '--flavor', default=None, group="Packaging options",
+                    help='Product flavor to be used when packaging with Gradle/Hvigor (android/ohos).'
+                ),
+            ]
 
         if binary_selection:
             decorators += [