Merge lp://qastaging/~mterry/snapcraft/more-source-options into lp://qastaging/~snappy-dev/snapcraft/core
Proposed by
Michael Terry
Status: | Merged |
---|---|
Merged at revision: | 103 |
Proposed branch: | lp://qastaging/~mterry/snapcraft/more-source-options |
Merge into: | lp://qastaging/~snappy-dev/snapcraft/core |
Prerequisite: | lp://qastaging/~mterry/snapcraft/source-options |
Diff against target: |
386 lines (+189/-42) 15 files modified
debian/control (+5/-1) integration-tests/data/bzr-head/snapcraft.yaml (+5/-0) integration-tests/data/bzr-tag/snapcraft.yaml (+6/-0) integration-tests/data/git-branch/snapcraft.yaml (+6/-0) integration-tests/data/git-head/snapcraft.yaml (+5/-0) integration-tests/data/git-tag/snapcraft.yaml (+6/-0) integration-tests/units/jobs.pxu (+76/-0) plugins/ant-project.yaml (+3/-0) plugins/autotools-project.yaml (+3/-0) plugins/cmake-project.yaml (+3/-0) plugins/make-project.yaml (+3/-0) plugins/python3-project.yaml (+3/-0) snapcraft/__init__.py (+53/-38) snapcraft/common.py (+7/-0) snapcraft/plugin.py (+5/-3) |
To merge this branch: | bzr merge lp://qastaging/~mterry/snapcraft/more-source-options |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Ted Gould (community) | Approve | ||
Snappy Developers | Pending | ||
Review via email: mp+264764@code.qastaging.launchpad.net |
Commit message
Add source-type, source-branch, and source-tag to the standard source options for plugins.
Description of the change
Add source-type, source-branch, and source-tag to the standard source options for plugins.
To post a comment you must log in.
OK, updated test to use 'bzr revno' and added replies for rest of your review comments.