fix(rockcraft_lpci_build): both build-base and build_base are allowed

canonical · Apr 9, 2024 · 9e0a3fd · 9e0a3fd
1 parent fb43333
commit 9e0a3fd
Showing 1 changed file with 8 additions and 4 deletions.
diff --git a/rockcraft_lpci_build/rockcraft_lpci_build.py b/rockcraft_lpci_build/rockcraft_lpci_build.py
@@ -314,9 +314,13 @@ def get_rock_archs(self) -> list:
 
     def get_rock_build_base(self) -> str:
         """Infer the Ubuntu series for lpci, from the rockcraft.yaml file"""
-        try:
-            build_base = self.rockcraft_yaml_raw["build_base"]
-        except KeyError:
+        build_base = self.rockcraft_yaml_raw.get(
+            "build-base", self.rockcraft_yaml_raw.get("build_base")
+        )
+
+        if not build_base:
+            logging.info(f"No 'build-base' in the rockfile. Using 'base' instead")
+            logging.info(self.rockcraft_yaml_raw)
             try:
                 build_base = self.rockcraft_yaml_raw["base"]
             except KeyError:
@@ -459,7 +463,7 @@ def wait_for_lp_builds(self) -> list:
                         logging.error("%s Continuing", error_msg)
                         continue
 
-                    logging.error("%s. Keeping the Launchpad repo alive", error_msg)
+                    logging.error("%s Keeping the Launchpad repo alive", error_msg)
                     atexit.unregister(self.delete_git_repository)
                     raise LaunchpadBuildFailure()
                 else: