Merge lp:~fboucault/qtcreator-plugin-ubuntu/overlay_for_xenial into lp:qtcreator-plugin-ubuntu

Proposed by Florian Boucault on 2016-07-08
Status: Merged
Merged at revision: 463
Proposed branch: lp:~fboucault/qtcreator-plugin-ubuntu/overlay_for_xenial
Merge into: lp:qtcreator-plugin-ubuntu
Diff against target: 12 lines (+1/-1)
1 file modified
share/qtcreator/ubuntu/scripts/usdk-target-build (+1/-1)
To merge this branch: bzr merge lp:~fboucault/qtcreator-plugin-ubuntu/overlay_for_xenial
Reviewer Review Type Date Requested Status
Zoltan Balogh (community) 2016-07-08 Approve on 2016-08-01
ubuntu-sdk-build-bot continuous-integration Needs Fixing on 2016-07-08
Review via email:

Commit message

LXD image build: add overlay for Xenial too

Description of the change

LXD image build: add overlay for Xenial too

To post a comment you must log in.
review: Needs Fixing (continuous-integration)
Zoltan Balogh (bzoltan) wrote :

thanks, merged

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'share/qtcreator/ubuntu/scripts/usdk-target-build'
2--- share/qtcreator/ubuntu/scripts/usdk-target-build 2016-07-06 09:18:16 +0000
3+++ share/qtcreator/ubuntu/scripts/usdk-target-build 2016-07-08 08:54:35 +0000
4@@ -526,7 +526,7 @@
5 # Pull down signature requirements
6 apt-get -y --force-yes install gnupg ubuntu-keyring
7 """).format(target_arch=self.target_arch))
8- if self.series == "vivid":
9+ if self.series == "vivid" or self.series == "xenial":
10 finish.write(dedent("""\
11 apt-get -y --force-yes install software-properties-common
12 add-apt-repository -y ppa:{ppa}


People subscribed via source and target branches