Merge lp:~larryprice/libertine/snap-pipe-deps into lp:libertine

Proposed by Larry Price on 2017-04-04
Status: Merged
Approved by: Christopher Townsend on 2017-04-06
Approved revision: 416
Merged at revision: 457
Proposed branch: lp:~larryprice/libertine/snap-pipe-deps
Merge into: lp:libertine
Diff against target: 11 lines (+2/-0)
1 file modified
snap/plugins/utils.py (+2/-0)
To merge this branch: bzr merge lp:~larryprice/libertine/snap-pipe-deps
Reviewer Review Type Date Requested Status
Christopher Townsend 2017-04-04 Approve on 2017-04-06
Libertine CI Bot continuous-integration Approve on 2017-04-04
Review via email: mp+321898@code.launchpad.net

Commit message

Handle parsing of conditional dependencies during snap build.

Description of the change

Handle parsing of conditional dependencies during snap build.

To post a comment you must log in.
Libertine CI Bot (libertine-ci-bot) wrote :

PASSED: Continuous integration, rev:416
https://jenkins.canonical.com/libertine/job/lp-libertine-ci/507/
Executed test runs:
    SUCCESS: https://jenkins.canonical.com/libertine/job/build/912
    SUCCESS: https://jenkins.canonical.com/libertine/job/test-0-autopkgtest/label=amd64,release=xenial+overlay,testname=default/748
    SUCCESS: https://jenkins.canonical.com/libertine/job/test-0-autopkgtest/label=amd64,release=zesty,testname=default/748
    SUCCESS: https://jenkins.canonical.com/libertine/job/test-0-autopkgtest/label=i386,release=xenial+overlay,testname=default/748
    SUCCESS: https://jenkins.canonical.com/libertine/job/test-0-autopkgtest/label=i386,release=zesty,testname=default/748
    SUCCESS: https://jenkins.canonical.com/libertine/job/build-0-fetch/923
    SUCCESS: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=amd64,release=xenial+overlay/912
        deb: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=amd64,release=xenial+overlay/912/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=amd64,release=zesty/912
        deb: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=amd64,release=zesty/912/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=i386,release=xenial+overlay/912
        deb: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=i386,release=xenial+overlay/912/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=i386,release=zesty/912
        deb: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=i386,release=zesty/912/artifact/output/*zip*/output.zip

Click here to trigger a rebuild:
https://jenkins.canonical.com/libertine/job/lp-libertine-ci/507/rebuild

review: Approve (continuous-integration)
Christopher Townsend (townsend) wrote :

Ok, I'll trust this works:)

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'snap/plugins/utils.py'
2--- snap/plugins/utils.py 2017-02-14 19:17:30 +0000
3+++ snap/plugins/utils.py 2017-04-04 17:11:19 +0000
4@@ -44,6 +44,8 @@
5 if ':' in line:
6 if not line.strip().startswith('${'):
7 self._parsing = False
8+ elif '|' in line:
9+ self._deps.append(_sanitize(line.split('|')[0]))
10 else:
11 self._deps.append(_sanitize(line))
12

Subscribers

People subscribed via source and target branches