Merge lp://qastaging/~sergiusens/snapcraft/plugins-are-types into lp://qastaging/~snappy-dev/snapcraft/core
Proposed by
Sergio Schvezov
| Status: | Merged |
|---|---|
| Approved by: | Ted Gould |
| Approved revision: | 169 |
| Merged at revision: | 157 |
| Proposed branch: | lp://qastaging/~sergiusens/snapcraft/plugins-are-types |
| Merge into: | lp://qastaging/~snappy-dev/snapcraft/core |
| Prerequisite: | lp://qastaging/~sergiusens/snapcraft/yaml-tabs |
| Diff against target: |
420 lines (+50/-50) 23 files modified
examples/godd/snapcraft.yaml (+1/-1) examples/gopaste/snapcraft.yaml (+1/-1) examples/java-hello-world/snapcraft.yaml (+2/-2) examples/libpipeline/snapcraft.yaml (+2/-2) examples/py2-project/snapcraft.yaml (+1/-1) examples/py3-project/snapcraft.yaml (+2/-2) examples/qmldemo/snapcraft.yaml (+2/-2) examples/tomcat-maven-webapp/snapcraft.yaml (+3/-3) examples/webcam-webui-snap/snapcraft.yaml (+2/-2) integration-tests/data/bzr-head/snapcraft.yaml (+1/-1) integration-tests/data/bzr-tag/snapcraft.yaml (+1/-1) integration-tests/data/conflicts/snapcraft.yaml (+2/-2) integration-tests/data/dependencies/snapcraft.yaml (+3/-3) integration-tests/data/git-branch/snapcraft.yaml (+1/-1) integration-tests/data/git-head/snapcraft.yaml (+1/-1) integration-tests/data/git-tag/snapcraft.yaml (+1/-1) integration-tests/data/hg-branch/snapcraft.yaml (+1/-1) integration-tests/data/hg-head/snapcraft.yaml (+1/-1) integration-tests/data/hg-tag/snapcraft.yaml (+1/-1) integration-tests/data/simple-copy/snapcraft.yaml (+1/-1) integration-tests/data/simple-tar/snapcraft.yaml (+8/-8) snapcraft/tests/test_yaml.py (+9/-9) snapcraft/yaml.py (+3/-3) |
| To merge this branch: | bzr merge lp://qastaging/~sergiusens/snapcraft/plugins-are-types |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Ted Gould (community) | Approve | ||
|
Review via email:
|
|||
Commit message
Plugins are of a type
Description of the change
I kept the plugin name withing the code base and just resorted to thinking that the plugins are of a type but are still plugins. Not sure it is the best idea.
To post a comment you must log in.
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
Looks good. I think that it makes more sense to call it a plugin in the code, otherwise we'll start hitting keywords.
Tests pass.