livecd-rootfs

Merge lp:~seb128/livecd-rootfs/desktop-next-duplicate into lp:livecd-rootfs

  1. desktop-next-duplicate
  2. Merge into trunk
Proposed by Sebastien Bacher on 2015-06-05
Status: Merged
Approved by: Iain Lane on 2015-06-05
Approved revision: 1123
Merged at revision: 1123
Proposed branch: lp:~seb128/livecd-rootfs/desktop-next-duplicate
Merge into: lp:livecd-rootfs
Diff against target: 18 lines (+0/-8)
1 file modified
live-build/auto/build (+0/-8)
To merge this branch: bzr merge lp:~seb128/livecd-rootfs/desktop-next-duplicate
Reviewer Review Type Date Requested Status
Iain Lane 2015-06-05 Approve on 2015-06-05
Review via email: mp+261182@code.launchpad.net

Commit Message

Remove duplicated code leftover in the previous desktop-next changeset

Description of the Change

Remove duplicated code leftover in the previous desktop-next changeset

To post a comment you must log in.
Iain Lane (laney) wrote :

I can't be *sure* that this is where the image build is failing, but it seems like a good candidate.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'live-build/auto/build'
2--- live-build/auto/build 2015-05-29 09:52:03 +0000
3+++ live-build/auto/build 2015-06-05 08:42:34 +0000
4@@ -349,14 +349,6 @@
5 ;;
6 esac
7
8-if [ "$PROJECT" = "ubuntu-desktop-next" ] && [ "$SUBPROJECT" = "system-image" ]; then
9- LB_LINUX_FLAVOURS=none
10-
11- # rename to have the right prefix etc
12- mv device.tar.gz "$PREFIX.device.tar.gz"
13-
14-fi
15-
16 for FLAVOUR in $LB_LINUX_FLAVOURS; do
17 if [ -z "$LB_LINUX_FLAVOURS" ] || [ "$LB_LINUX_FLAVOURS" = "none" ]; then
18 continue

Subscribers

People subscribed via source and target branches