Mir

Merge lp:~vanvugt/mir/fix-1287600-trunk-0.1.6 into lp:~mir-team/mir/trunk-0.1.6

Proposed by Daniel van Vugt on 2014-03-04
Status: Merged
Approved by: kevin gunn on 2014-03-04
Approved revision: 1442
Merged at revision: 1443
Proposed branch: lp:~vanvugt/mir/fix-1287600-trunk-0.1.6
Merge into: lp:~mir-team/mir/trunk-0.1.6
Diff against target: 21 lines (+3/-1)
2 files modified
cross-compile-chroot.sh (+1/-1)
debian/changelog (+2/-0)
To merge this branch: bzr merge lp:~vanvugt/mir/fix-1287600-trunk-0.1.6
Reviewer Review Type Date Requested Status
kevin gunn (community) 2014-03-04 Approve on 2014-03-04
Review via email: mp+209191@code.launchpad.net

Commit message

Don't pass a parameter to bash's popd command. It doesn't expect one and will
return an error from cross-compile-chroot.sh. (LP: #1287600)

To post a comment you must log in.
kevin gunn (kgunn72) wrote :

this was reviewed and approved on lp:mir/devel
approving/merging as a cherry pick here

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'cross-compile-chroot.sh'
2--- cross-compile-chroot.sh 2014-02-18 02:12:21 +0000
3+++ cross-compile-chroot.sh 2014-03-04 08:43:46 +0000
4@@ -80,4 +80,4 @@
5
6 make -j${NUM_JOBS}
7
8-popd ${BUILD_DIR} > /dev/null
9+popd > /dev/null
10
11=== modified file 'debian/changelog'
12--- debian/changelog 2014-03-04 07:52:12 +0000
13+++ debian/changelog 2014-03-04 08:43:46 +0000
14@@ -59,6 +59,8 @@
15 . Ubuntu trusty update "glm 0.9.5.1-1" broke Mir builds. Work around the
16 change. (LP: #1285955)
17 . Screencast feature by compositing to offscreen buffer (LP: #1207312)
18+ . Don't pass a parameter to bash's popd command. It doesn't expect one
19+ and will return an error from cross-compile-chroot.sh. (LP: #1287600)
20
21 -- Kevin Gunn <kevin.gunn@canonical.com> Thu, 27 Feb 2014 19:37:47 -0600
22

Subscribers

People subscribed via source and target branches