livecd-rootfs

Merge lp:~mwhudson/livecd-rootfs/tyop into lp:livecd-rootfs

  1. tyop
  2. Merge into trunk
Proposed by Michael Hudson-Doyle
Status: Merged
Approved by: Łukasz Zemczak
Approved revision: 1737
Merged at revision: 1737
Proposed branch: lp:~mwhudson/livecd-rootfs/tyop
Merge into: lp:livecd-rootfs
Diff against target: 26 lines (+7/-1)
2 files modified
debian/changelog (+6/-0)
live-build/auto/build (+1/-1)
To merge this branch: bzr merge lp:~mwhudson/livecd-rootfs/tyop
Reviewer Review Type Date Requested Status
Łukasz Zemczak Approve
Review via email: mp+360766@code.launchpad.net

Description of the change

This typo is in bionic-proposed currently too...

To post a comment you must log in.
Revision history for this message
Łukasz Zemczak (sil2100) wrote :

Darn typo. +1.

review: Approve
Revision history for this message
Łukasz Zemczak (sil2100) wrote :

...love the name of the branch btw.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/changelog'
2--- debian/changelog 2018-12-10 22:15:42 +0000
3+++ debian/changelog 2018-12-12 02:20:50 +0000
4@@ -1,3 +1,9 @@
5+livecd-rootfs (2.550) UNRELEASED; urgency=medium
6+
7+ * Fix typo preventing builds of ubuntu-core images.
8+
9+ -- Michael Hudson-Doyle <michael.hudson@ubuntu.com> Wed, 12 Dec 2018 15:09:28 +1300
10+
11 livecd-rootfs (2.549) disco; urgency=medium
12
13 [ Tobias Koch ]
14
15=== modified file 'live-build/auto/build'
16--- live-build/auto/build 2018-12-06 11:38:07 +0000
17+++ live-build/auto/build 2018-12-12 02:20:50 +0000
18@@ -23,7 +23,7 @@
19 if [ "${IMAGEFORMAT:-}" = "ubuntu-image" ]; then
20 # Use ubuntu-image instead of live-build
21
22- if [ "$PROJECT" = "ubuntu-core"]; then
23+ if [ "$PROJECT" = "ubuntu-core" ]; then
24 CHANNEL="${CHANNEL:-edge}"
25 env SNAPPY_STORE_NO_CDN=1 \
26 ubuntu-image snap -c "$CHANNEL" $UBUNTU_IMAGE_ARGS \

Subscribers

People subscribed via source and target branches