From 06fa74d3c3f15d7f1eb28cbcdb25e1f7517af379 Mon Sep 17 00:00:00 2001 From: John Mulligan Date: Wed, 8 Oct 2025 10:23:25 -0400 Subject: [PATCH] script/build-with-container: be consistent with naming in distro kinds Update the DistroKind enum and related items so that the naming is applied consistently. That is: the canonical (no pun indented) form of the name is "" and codenames, such as "jammy" or "bookworm" are aliases. This matches the previously existing code. Signed-off-by: John Mulligan (cherry picked from commit ac11a80a63ab1909fbdf682d830acde96856f502) --- src/script/build-with-container.py | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/src/script/build-with-container.py b/src/script/build-with-container.py index 7fd50ea0fc0..b121146a487 100755 --- a/src/script/build-with-container.py +++ b/src/script/build-with-container.py @@ -109,7 +109,7 @@ class DistroKind(StrEnum): ROCKY10 = "rocky10" UBUNTU2204 = "ubuntu22.04" UBUNTU2404 = "ubuntu24.04" - BOOKWORM = "bookworm" + DEBIAN12 = "debian12" @classmethod def uses_dnf(cls): @@ -148,7 +148,9 @@ class DistroKind(StrEnum): str(cls.UBUNTU2404): cls.UBUNTU2404, "ubuntu-noble": cls.UBUNTU2404, "noble": cls.UBUNTU2404, - str(cls.BOOKWORM): cls.BOOKWORM, + str(cls.DEBIAN12): cls.DEBIAN12, + "debian-bookworm": cls.DEBIAN12, + "bookworm": cls.DEBIAN12, } @classmethod @@ -165,7 +167,7 @@ class DefaultImage(StrEnum): ROCKY10 = "docker.io/rockylinux/rockylinux:10" UBUNTU2204 = "docker.io/ubuntu:22.04" UBUNTU2404 = "docker.io/ubuntu:24.04" - BOOKWORM = "docker.io/debian:bookworm" + DEBIAN12 = "docker.io/debian:bookworm" class CommandFailed(Exception): -- 2.39.5