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

Proposed by Michael Hudson-Doyle
Status: Merged
Merged at revision: 047f977db81398d5518deb5bc65d98b2876f4481
Proposed branch: ~mwhudson/ubuntu-cdimage:older-ubuntustudio-location-2
Merge into: ubuntu-cdimage:main
Diff against target: 16 lines (+4/-1)
1 file modified
lib/cdimage/tree.py (+4/-1)
Reviewer Review Type Date Requested Status
Ubuntu CD Image Team Pending
Review via email: mp+466986@code.launchpad.net

Commit message

continue whackamole to publish older ubuntustudio images in old location

Description of the change

Would surely be nicer to test this with a shorter turnaround cycle than a complete build...

To post a comment you must log in.

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 041238e..25db595 100644
3--- a/lib/cdimage/tree.py
4+++ b/lib/cdimage/tree.py
5@@ -2043,7 +2043,10 @@ class DailyTreePublisher(Publisher):
6 self.tree.url_for_path(image_path))
7
8 def publish_binary(self, publish_type, arch, date):
9- in_prefix = "%s-%s-%s" % (self.config.series, publish_type, arch)
10+ if self.project == "ubuntustudio" and self.config["DIST"] <= "noble":
11+ in_prefix = "%s-%s-%s" % (self.config.series, "daily-live", arch)
12+ else:
13+ in_prefix = "%s-%s-%s" % (self.config.series, publish_type, arch)
14 if publish_type == "live-core":
15 out_prefix = "ubuntu-core-%s-%s" % (self.config.core_series, arch)
16 elif publish_type == "live-core-desktop":

Subscribers

People subscribed via source and target branches