Merge lp:~vorlon/ubuntu-cdimage/public-info-out-of-private-production into lp:ubuntu-cdimage

[Steve Langasek]

[Steve Langasek (vorlon)]

If this approach is palatable, I would want to do the same for production/current-triggers, which we have a history of failing to update at the start of the cycle. (But also, it would be good to make the format of current-triggers match that of livefs-launchpad and etc/default-arches, so that defaults can be inherited across releases...)

[Steve Langasek (vorlon)]

well, that last bit should be a one-liner change, so separate MP raised already at https://code.launchpad.net/~vorlon/ubuntu-cdimage/match-series-for-current-triggers/+merge/324123

[Adam Conrad (adconrad)]

Seems entirely reasonable to me. I'm not going to review the file itself, assuming that it's a straight cp -a from production.

review: Approve

=== added file 'etc/livefs-launchpad'
--- etc/livefs-launchpad	1970-01-01 00:00:00 +0000
+++ etc/livefs-launchpad	2017-05-16 16:20:32 +0000
@@ -0,0 +1,34 @@
+# PROJECT		IMAGE_TYPE		DIST		ARCH		[INSTANCE/]OWNER/NAME
+# Put more specific matches first.
+# Like etc/default-arches, "PROJECT" is in fact PROJECT[-SUBPROJECT][-LOCALE].
+
+ubuntu			daily-live		*		*		ubuntu-cdimage/ubuntu
+ubuntu-desktop-next	daily-live		-vivid		*		ubuntu-cdimage/ubuntu-desktop-next
+ubuntu-desktop-next-system-image	daily-preinstalled	wily-	*	ubuntu-cdimage/ubuntu-desktop-next
+kubuntu			daily-live		*		*		ubuntu-cdimage/kubuntu
+kubuntu-plasma5		daily-live		*		*		ubuntu-cdimage/kubuntu-plasma5
+edubuntu		dvd			*		*		ubuntu-cdimage/edubuntu
+xubuntu			daily-live		*		*		ubuntu-cdimage/xubuntu
+ubuntu-server		daily			quantal-	*		ubuntu-cdimage/ubuntu-server
+ubuntu-server		daily-preinstalled	xenial-		*		ubuntu-cdimage/cpc
+ubuntu-server-live	daily-live		zesty-		*		ubuntu-cdimage/ubuntu-server-live
+ubuntustudio		dvd			*		*		ubuntu-cdimage/ubuntustudio
+mythbuntu		daily-live		*		*		ubuntu-cdimage/mythbuntu
+lubuntu-next		daily-live		*		*		ubuntu-cdimage/lubuntu-next
+lubuntu			daily-live		*		*		ubuntu-cdimage/lubuntu
+livecd-base		livecd-base		*		*		ubuntu-cdimage/livecd-base
+ubuntu-base		daily			*		*		ubuntu-cdimage/ubuntu-base
+ubuntu-core		daily-live		*		*		ubuntu-cdimage/ubuntu-core
+ubuntu-core-system-image daily-preinstalled	*		*		ubuntu-cdimage/ubuntu-core-system-image
+kubuntu-active		daily-live		*		*		ubuntu-cdimage/kubuntu-active
+ubuntukylin		daily-live		*		*		ubuntu-cdimage/ubuntukylin
+ubuntu-gnome		daily-live		*		*		ubuntu-cdimage/ubuntu-gnome
+ubuntu-mate		daily-live		*		*		ubuntu-cdimage/ubuntu-mate
+ubuntu-budgie		daily-live		*		*		ubuntu-cdimage/ubuntu-budgie
+ubuntu-touch		daily-preinstalled	ubuntu-rtm/*	*		ubuntu-cdimage/ubuntu-touch
+ubuntu-touch		daily-preinstalled	trusty-		*		ubuntu-cdimage/ubuntu-touch
+ubuntu-touch-custom	daily-preinstalled	vivid-		*		ubuntu-cdimage/ubuntu-touch-custom
+ubuntu-pd		daily-preinstalled	*		*		ubuntu-cdimage/ubuntu-pd
+ubuntu			dvd			-precise	*		ubuntu-cdimage/ubuntu-dvd
+ubuntu-wubi		wubi			*		*		ubuntu-cdimage/ubuntu-wubi
+ubuntu-zh_CN		daily-live		-raring		*		ubuntu-cdimage/ubuntu-zh-cn

=== modified file 'lib/cdimage/livefs.py'
--- lib/cdimage/livefs.py	2017-04-29 04:14:46 +0000
+++ lib/cdimage/livefs.py	2017-05-16 16:20:32 +0000
@@ -301,6 +301,8 @@
     image_type = config.image_type
 
     path = os.path.join(config.root, "production", "livefs-launchpad")
+    if not os.path.exists(path):
+        path = os.path.join(config.root, "etc", "livefs-launchpad")
     if os.path.exists(path):
         with open(path) as f:
             for line in f: