modules: Remove redundant prefix warnings

Redundancy is harmless here and we can never promote this to an error, keeping it as a warning has little value. [release]
flathub-infra · Oct 18, 2024 · fd8b75f · fd8b75f
1 parent 29f3499
commit fd8b75f
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 23 deletions.
diff --git a/flatpak_builder_lint/checks/modules.py b/flatpak_builder_lint/checks/modules.py
@@ -1,5 +1,3 @@
-import re
-
 from . import Check
 
 
@@ -47,23 +45,15 @@ def check_module(self, module: dict) -> None:
 
         if buildsystem == "autotools" and (config_opts := module.get("config-opts")):
             for opt in config_opts:
-                if re.match(
-                    "^--prefix=(/(usr|app)|\\$FLATPAK_DEST|\\${FLATPAK_DEST})/?$",
-                    opt,
-                ):
-                    self.warnings.add(f"module-{name}-autotools-redundant-prefix")
-                elif opt.startswith("--enable-debug") and not opt.endswith("=no"):
+                if opt.startswith("--enable-debug") and not opt.endswith("=no"):
                     self.errors.add(f"module-{name}-autotools-non-release-build")
 
         if buildsystem == "cmake":
             self.warnings.add(f"module-{name}-buildsystem-is-plain-cmake")
 
-        cm_reg = "^-DCMAKE_INSTALL_PREFIX(:PATH)?=(/(usr|app)|\\$FLATPAK_DEST|\\${FLATPAK_DEST})/?$"
         if buildsystem in ("cmake-ninja", "cmake") and (config_opts := module.get("config-opts")):
             for opt in config_opts:
-                if re.match(cm_reg, opt):
-                    self.warnings.add(f"module-{name}-cmake-redundant-prefix")
-                elif opt.startswith("-DCMAKE_BUILD_TYPE"):
+                if opt.startswith("-DCMAKE_BUILD_TYPE"):
                     split = opt.split("=")
                     # There is too many possible choices and customizations.
                     # So just make this a warning.

diff --git a/tests/manifests/modules.json b/tests/manifests/modules.json
@@ -5,8 +5,7 @@
             "name": "module1",
             "buildsystem": "cmake",
             "config-opts": [
-                "-DCMAKE_BUILD_TYPE=Debug",
-                "-DCMAKE_INSTALL_PREFIX=/app"
+                "-DCMAKE_BUILD_TYPE=Debug"
             ],
             "sources": [
                 {
@@ -36,13 +35,6 @@
                     "sha1": "deadbeef"
                 }
             ]
-        },
-        {
-            "name": "module2",
-            "buildsystem": "autotools",
-            "config-opts": [
-                "--prefix=/app"
-            ]
         }
     ]
 }
diff --git a/tests/test_manifest.py b/tests/test_manifest.py
@@ -234,8 +234,6 @@ def test_manifest_modules() -> None:
     warnings = {
         "module-module1-buildsystem-is-plain-cmake",
         "module-module1-cmake-non-release-build",
-        "module-module2-autotools-redundant-prefix",
-        "module-module1-cmake-redundant-prefix",
         "module-module1-source-sha1-deprecated",
     }