Merge ~mwhudson/ubuntu-cdimage:older-ubuntustudio-location into ubuntu-cdimage:main

Proposed by Michael Hudson-Doyle
Status: Merged
Merged at revision: d43e22ce48c4a5724b55c5912970e54df3ccb3c5
Proposed branch: ~mwhudson/ubuntu-cdimage:older-ubuntustudio-location
Merge into: ubuntu-cdimage:main
Diff against target: 23 lines (+4/-1)
1 file modified
lib/cdimage/tree.py (+4/-1)
Reviewer Review Type Date Requested Status
Steve Langasek Approve
Review via email: mp+466981@code.launchpad.net

Commit message

continue publishing older ubuntustudio installers as DVDs

To post a comment you must log in.
Revision history for this message
Steve Langasek (vorlon) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/lib/cdimage/tree.py b/lib/cdimage/tree.py
2index 6fac63b..041238e 100644
3--- a/lib/cdimage/tree.py
4+++ b/lib/cdimage/tree.py
5@@ -409,6 +409,9 @@ class Publisher:
6 return "live-core-desktop"
7 elif self.project == "ubuntu-mini-iso":
8 return "mini-iso"
9+ elif (self.project == "ubuntustudio" and
10+ self.config["DIST"] <= "noble"):
11+ return "dvd"
12 else:
13 return "desktop"
14 elif self.image_type.endswith("_dvd") or self.image_type == "dvd":
15@@ -445,7 +448,7 @@ class Publisher:
16 elif publish_type == "minimal":
17 return "daily-minimal"
18 elif publish_type == "dvd":
19- return "dvd"
20+ return "daily-live"
21 elif publish_type in (
22 "addon", "alternate", "base", "install", "server",
23 "legacy-server"):

Subscribers

People subscribed via source and target branches