Merge ~mwhudson/ubuntu-cdimage:CDIMAGE_DVD-for-old-ubuntustudio into ubuntu-cdimage:main

[Michael Hudson-Doyle]

Set CDIMAGE_DVD=1 for <= noble ubuntustudio images

Otherwise debian-cd does not name the ISO how the publication code
expects.

[Łukasz Zemczak (sil2100)]

This is looking correct, especially that the additional check for DVD was since long unnecessary. There would be bonus points for unit tests, but this is good anyway.

review: Approve

diff --git a/bin/cron.daily-live b/bin/cron.daily-live
index a1c4e21..a6dfd82 100755
--- a/bin/cron.daily-live
+++ b/bin/cron.daily-live
@@ -52,6 +52,10 @@ def main():
         image_type = "daily-live"
 
     config = Config(IMAGE_TYPE=image_type)
+    if project == "ubuntustudio" and series <= "noble":
+        # Without this, debian-cd does not name the ISO the way the
+        # publication code expects.
+        config["CDIMAGE_DVD"] = "1"
     config["CDIMAGE_LIVE"] = "1"
     if not build_image_set(config, options):
         sys.exit(1)
diff --git a/lib/cdimage/germinate.py b/lib/cdimage/germinate.py
index 2cc50e2..a7dade0 100644
--- a/lib/cdimage/germinate.py
+++ b/lib/cdimage/germinate.py
@@ -202,7 +202,7 @@ class GerminateOutput:
                 self._seeds.append(line.split(":", 1)[0])
 
     def pool_seeds(self):
-        if not (self.config["CDIMAGE_DVD"] or self.config["CDIMAGE_LIVE"]):
+        if not self.config["CDIMAGE_LIVE"]:
             raise NoMasterSeeds("No seeds found for master task!")
         project = self.config.project