Merge lp:~larryprice/libertine/seccomp-missing-os into lp:libertine

Proposed by Larry Price
Status: Merged
Approved by: Christopher Townsend
Approved revision: 318
Merged at revision: 341
Proposed branch: lp:~larryprice/libertine/seccomp-missing-os
Merge into: lp:libertine
Diff against target: 11 lines (+1/-1)
1 file modified
python/libertine/ChrootContainer.py (+1/-1)
To merge this branch: bzr merge lp:~larryprice/libertine/seccomp-missing-os
Reviewer Review Type Date Requested Status
Libertine CI Bot continuous-integration Approve
Christopher Townsend Approve
Review via email: mp+312206@code.launchpad.net

Commit message

Fix syntax for setting environ during chroot intialization.

Description of the change

Fix syntax for setting environ during chroot intialization.

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

yep

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

PASSED: Continuous integration, rev:318
https://jenkins.canonical.com/libertine/job/lp-libertine-ci/242/
Executed test runs:
    SUCCESS: https://jenkins.canonical.com/libertine/job/build/506
    SUCCESS: https://jenkins.canonical.com/libertine/job/test-0-autopkgtest/label=amd64,release=vivid+overlay,testname=default/399
    SUCCESS: https://jenkins.canonical.com/libertine/job/test-0-autopkgtest/label=amd64,release=xenial+overlay,testname=default/399
    SUCCESS: https://jenkins.canonical.com/libertine/job/test-0-autopkgtest/label=amd64,release=zesty,testname=default/399
    SUCCESS: https://jenkins.canonical.com/libertine/job/test-0-autopkgtest/label=i386,release=vivid+overlay,testname=default/399
    SUCCESS: https://jenkins.canonical.com/libertine/job/test-0-autopkgtest/label=i386,release=xenial+overlay,testname=default/399
    SUCCESS: https://jenkins.canonical.com/libertine/job/test-0-autopkgtest/label=i386,release=zesty,testname=default/399
    SUCCESS: https://jenkins.canonical.com/libertine/job/build-0-fetch/516
    SUCCESS: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=amd64,release=vivid+overlay/500
        deb: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=amd64,release=vivid+overlay/500/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=amd64,release=xenial+overlay/500
        deb: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=amd64,release=xenial+overlay/500/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=amd64,release=zesty/500
        deb: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=amd64,release=zesty/500/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=i386,release=vivid+overlay/500
        deb: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=i386,release=vivid+overlay/500/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=i386,release=xenial+overlay/500
        deb: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=i386,release=xenial+overlay/500/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=i386,release=zesty/500
        deb: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=i386,release=zesty/500/artifact/output/*zip*/output.zip

Click here to trigger a rebuild:
https://jenkins.canonical.com/libertine/job/lp-libertine-ci/242/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-11-30 19:11:46 +0000
3+++ python/libertine/ChrootContainer.py 2016-11-30 21:55:48 +0000
4@@ -53,7 +53,7 @@
5 self._window_manager = None
6 # FIXME: Disabling seccomp is a temporary measure until we fully understand why we need
7 # it or figure out when we need it.
8- environ['PROOT_NO_SECCOMP'] = '1'
9+ os.environ['PROOT_NO_SECCOMP'] = '1'
10 os.environ['FAKECHROOT_CMD_SUBST'] = '$FAKECHROOT_CMD_SUBST:/usr/bin/chfn=/bin/true'
11 os.environ['DEBIAN_FRONTEND'] = 'noninteractive'
12

Subscribers

People subscribed via source and target branches