Merge lp://qastaging/~ted/snapcraft/qml into lp://qastaging/~snappy-dev/snapcraft/core
Proposed by
Ted Gould
Status: | Merged |
---|---|
Approved by: | Michael Terry |
Approved revision: | 116 |
Merged at revision: | 126 |
Proposed branch: | lp://qastaging/~ted/snapcraft/qml |
Merge into: | lp://qastaging/~snappy-dev/snapcraft/core |
Prerequisite: | lp://qastaging/~ted/snapcraft/wrapper-path |
Diff against target: |
379 lines (+179/-17) 17 files modified
examples/qmldemo/demo.qml (+9/-0) examples/qmldemo/meta/package.yaml (+10/-0) examples/qmldemo/meta/readme.md (+4/-0) examples/qmldemo/snapcraft.yaml (+8/-0) integration-tests/data/assemble/binary1.after (+1/-1) plugins/ubuntu.yaml (+3/-1) snapcraft/cmds.py (+2/-2) snapcraft/plugins/copy.py (+1/-1) snapcraft/plugins/jdk.py (+1/-1) snapcraft/plugins/python2.py (+1/-1) snapcraft/plugins/python3.py (+1/-1) snapcraft/plugins/qml.py (+125/-0) snapcraft/plugins/tests/test_ubuntu.py (+1/-1) snapcraft/plugins/ubuntu.py (+8/-4) snapcraft/tests/test_cmds.py (+1/-1) snapcraft/tests/test_ubuntu_plugin.py (+1/-1) snapcraft/tests/test_yaml.py (+2/-2) |
To merge this branch: | bzr merge lp://qastaging/~ted/snapcraft/qml |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Michael Terry (community) | Approve | ||
Leo Arias (community) | Needs Fixing | ||
Review via email: mp+265720@code.qastaging.launchpad.net |
This proposal supersedes a proposal from 2015-07-22.
Commit message
QML Plugin
To post a comment you must log in.
Same pita comment about the format instead of %.
I'm leaving a needs fixing because of the naked except.