Ubuntu CD Images

Merge lp:~tsimonq2/ubuntu-cdimage/lubuntu-next-germinate into lp:ubuntu-cdimage

  1. lubuntu-next-germinate
  2. Merge into mainline
Proposed by Simon Quigley
Status: Merged
Merged at revision: 1668
Proposed branch: lp:~tsimonq2/ubuntu-cdimage/lubuntu-next-germinate
Merge into: lp:ubuntu-cdimage
Diff against target: 20 lines (+3/-1)
1 file modified
lib/cdimage/germinate.py (+3/-1)
To merge this branch: bzr merge lp:~tsimonq2/ubuntu-cdimage/lubuntu-next-germinate
Reviewer Review Type Date Requested Status
Ubuntu CD Image Team Pending
Review via email: mp+324571@code.launchpad.net

Description of the change

This fixes the FTBFS shown in http://people.canonical.com/~ubuntu-archive/cd-build-logs/lubuntu-next/artful/daily-live-20170524.log that is a result of lubuntu-next not being in the relevant Germinate files.

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
1=== modified file 'lib/cdimage/germinate.py'
2--- lib/cdimage/germinate.py 2017-05-09 05:39:47 +0000
3+++ lib/cdimage/germinate.py 2017-05-24 21:20:48 +0000
4@@ -81,7 +81,7 @@
5 elif project == "xubuntu":
6 if series >= "intrepid":
7 sources.insert(0, pattern % "xubuntu-dev")
8- elif project == "lubuntu":
9+ elif project == "lubuntu" or "lubuntu-next":
10 sources.insert(0, pattern % "lubuntu-dev")
11 elif project == "ubuntu-gnome":
12 sources.insert(0, pattern % "ubuntu-gnome-dev")
13@@ -149,6 +149,8 @@
14 return "moblin.%s" % self.config.series
15 elif project == "ubuntu-desktop-next":
16 return "ubuntu-touch.%s" % self.config.series
17+ elif project == "lubuntu-next":
18+ return "lubuntu.%s" % self.config.series
19 else:
20 return "%s.%s" % (project, self.config.series)
21

Subscribers

People subscribed via source and target branches