Merge pull request #318 from hartwork/require-etc-portage-location-on…

…-non-gentoo-hosts [gentoo-build] Require `--etc-portage PATH` on non-Gentoo hosts
hartwork · Oct 24, 2024 · de4c98f · de4c98f
2 parents 160c870 + 78d46de
commit de4c98f
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 1 deletion.
diff --git a/binary_gentoo/internal/cli/build.py b/binary_gentoo/internal/cli/build.py
@@ -164,8 +164,13 @@ def parse_command_line(argv):
         "--etc-portage",
         dest="host_etc_portage",
         metavar="DIR",
+        required=not HOST_IS_GENTOO,
         default="/etc/portage",
-        help='enforce specific location for /etc/portage (default: "%(default)s")',
+        help=(
+            'enforce specific location for /etc/portage (default: "%(default)s")'
+            if HOST_IS_GENTOO
+            else "specify /etc/portage location (required)"
+        ),
     )
 
     parser_group_flavors_or_image = parser.add_mutually_exclusive_group()

diff --git a/binary_gentoo/internal/cli/tests/test_build.py b/binary_gentoo/internal/cli/tests/test_build.py
@@ -107,6 +107,7 @@ def _run_gentoo_build_with_subprocess_mocked(
             TemporaryDirectory() as temp_pkgdir,
             TemporaryDirectory() as temp_portdir,
             TemporaryDirectory() as temp_logdir,
+            TemporaryDirectory() as temp_etcportagedir,
         ):
             argv = (
                 [
@@ -119,6 +120,8 @@ def _run_gentoo_build_with_subprocess_mocked(
                     temp_portdir,
                     "--logdir",
                     temp_logdir,
+                    "--etc-portage",
+                    temp_etcportagedir,
                     "--gentoo-profile",
                     "default/linux/profile123",
                     "--cflags",