Libertine

Merge lp:~brandontschaefer/libertine/syntax-error into lp:libertine

  1. syntax-error
  2. Merge into devel
Proposed by Brandon Schaefer
Status: Merged
Approved by: Christopher Townsend
Approved revision: 247
Merged at revision: 247
Proposed branch: lp:~brandontschaefer/libertine/syntax-error
Merge into: lp:libertine
Diff against target: 12 lines (+1/-1)
1 file modified
python/libertine/ChrootContainer.py (+1/-1)
To merge this branch: bzr merge lp:~brandontschaefer/libertine/syntax-error
Reviewer Review Type Date Requested Status
Libertine CI Bot continuous-integration Approve
Christopher Townsend Approve
Review via email: mp+297523@code.launchpad.net

Commit message

Fix a syntax error

Description of the change

Fix a syntax error

To post a comment you must log in.
Revision history for this message
Christopher Townsend (townsend) wrote :

Yes, it fixes it indeed.

review: Approve
Revision history for this message
Libertine CI Bot (libertine-ci-bot) wrote :

PASSED: Continuous integration, rev:247
https://jenkins.canonical.com/libertine/job/libertine-ci-verify-mp/261/
Executed test runs:
    SUCCESS: https://jenkins.canonical.com/libertine/job/generic-ci-generate-dsc/264
    SUCCESS: https://jenkins.canonical.com/libertine/job/libertine-ci-build-and-test-dsc/architecture=amd64,distribution=vivid,label_exp=jenkins-slave-0%20%7C%7C%20jenkins-slave-2/223
    SUCCESS: https://jenkins.canonical.com/libertine/job/libertine-ci-build-and-test-dsc/architecture=amd64,distribution=xenial,label_exp=jenkins-slave-0%20%7C%7C%20jenkins-slave-2/223
    SUCCESS: https://jenkins.canonical.com/libertine/job/libertine-ci-build-and-test-dsc/architecture=i386,distribution=vivid,label_exp=jenkins-slave-0%20%7C%7C%20jenkins-slave-2/223
    SUCCESS: https://jenkins.canonical.com/libertine/job/libertine-ci-build-and-test-dsc/architecture=i386,distribution=xenial,label_exp=jenkins-slave-0%20%7C%7C%20jenkins-slave-2/223
    None: https://jenkins.canonical.com/libertine/job/libertine-ci-update-mp/1159/console

Click here to trigger a rebuild:
https://jenkins.canonical.com/libertine/job/libertine-ci-verify-mp/261/rebuild

review: Approve (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'python/libertine/ChrootContainer.py'
2--- python/libertine/ChrootContainer.py 2016-06-14 20:22:33 +0000
3+++ python/libertine/ChrootContainer.py 2016-06-15 18:11:51 +0000
4@@ -250,7 +250,7 @@
5 proot_cmd = self._build_proot_command()
6
7 args = shlex.split(proot_cmd)
8- args.extend(utils.setup_window_manager(self.container_id), enable_toolbars=True)
9+ args.extend(utils.setup_window_manager(self.container_id, enable_toolbars=True))
10 window_manager = psutil.Popen(args)
11
12 args = shlex.split(proot_cmd)

Subscribers

People subscribed via source and target branches