Merge lp:~marcustomlinson/unity-js-scopes/lp-1534534 into lp:unity-js-scopes

Proposed by Marcus Tomlinson on 2016-01-15
Status: Merged
Approved by: Alexandre Abreu on 2016-01-15
Approved revision: 125
Merged at revision: 124
Proposed branch: lp:~marcustomlinson/unity-js-scopes/lp-1534534
Merge into: lp:unity-js-scopes
Diff against target: 12 lines (+1/-1)
1 file modified
src/tool/main.cc (+1/-1)
To merge this branch: bzr merge lp:~marcustomlinson/unity-js-scopes/lp-1534534
Reviewer Review Type Date Requested Status
Alexandre Abreu (community) 2016-01-15 Approve on 2016-01-15
PS Jenkins bot (community) continuous-integration Approve on 2016-01-15
Review via email: mp+282710@code.launchpad.net

Commit message

Get chroot packages from "ppa:ubuntu-sdk-team/ppa"

To post a comment you must log in.
125. By Marcus Tomlinson on 2016-01-15

Revert installation reorder

Alexandre Abreu (abreu-alexandre) wrote :

+1 definitely! thanks for spotting that

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'src/tool/main.cc'
2--- src/tool/main.cc 2015-10-23 07:27:41 +0000
3+++ src/tool/main.cc 2016-01-15 10:19:45 +0000
4@@ -56,7 +56,7 @@
5 {
6 std::string setup_script;
7 setup_script += "click chroot -a armhf -f ubuntu-sdk-" + fw + " maint apt-get install software-properties-common -y --force-yes \n";
8- setup_script += "click chroot -a armhf -f ubuntu-sdk-" + fw + " maint add-apt-repository ppa:ubuntu-sdk-team/staging -y \n";
9+ setup_script += "click chroot -a armhf -f ubuntu-sdk-" + fw + " maint add-apt-repository ppa:ubuntu-sdk-team/ppa -y \n";
10
11 setup_script += "click chroot -a armhf -f ubuntu-sdk-" + fw + " maint sh -c \"find /etc/apt/sources.list.d//*.list \
12 -exec apt-get update -o Dir::Etc::sourcelist='{}' -o Dir::Etc::sourceparts='-' -o APT::Get::List-Cleanup='0' \\;\" \n";

Subscribers

People subscribed via source and target branches

to all changes: