Merge lp://qastaging/~sergiusens/snapcraft/filesets into lp://qastaging/~snappy-dev/snapcraft/core

Proposed by Sergio Schvezov
Status: Merged
Approved by: Sergio Schvezov
Approved revision: 178
Merged at revision: 159
Proposed branch: lp://qastaging/~sergiusens/snapcraft/filesets
Merge into: lp://qastaging/~snappy-dev/snapcraft/core
Prerequisite: lp://qastaging/~sergiusens/snapcraft/plugins-are-types
Diff against target: 732 lines (+346/-142)
19 files modified
examples/gopaste/snapcraft.yaml (+1/-1)
plugins/ant-project.yaml (+2/-0)
plugins/autotools-project.yaml (+2/-0)
plugins/cmake-project.yaml (+10/-8)
plugins/copy.yaml (+2/-0)
plugins/go-project.yaml (+2/-0)
plugins/make-project.yaml (+8/-6)
plugins/maven-project.yaml (+2/-0)
plugins/python2-project.yaml (+2/-0)
plugins/python3-project.yaml (+2/-0)
plugins/tar-content.yaml (+2/-0)
snapcraft/__init__.py (+6/-6)
snapcraft/plugin.py (+60/-51)
snapcraft/plugins/go.py (+0/-6)
snapcraft/plugins/jdk.py (+6/-4)
snapcraft/plugins/qml.py (+4/-4)
snapcraft/tests/test_plugin.py (+138/-53)
snapcraft/tests/test_yaml.py (+73/-2)
snapcraft/yaml.py (+24/-1)
To merge this branch: bzr merge lp://qastaging/~sergiusens/snapcraft/filesets
Reviewer Review Type Date Requested Status
Sergio Schvezov Approve
Michael Vogt (community) Approve
Review via email: mp+270455@code.qastaging.launchpad.net

Commit message

Filesets based filtering for stage and snap

Description of the change

I'm bit torn on this one.

Right now, the plugin can add additional filters to the snap stage, but that is not in spec. I'm not sure we want this in the part declaration, but that breaks bad when we have plugins that depend on other plugins to run providing no means to configure them easily.

I can try and hack this into the plugin yaml files (at the top level with options and build-deps) but that is one layer above.

I'm also hesitant to provide a 'stage_fileset' method if we don't go down the yaml path.

To post a comment you must log in.
Revision history for this message
Michael Vogt (mvo) wrote :

Thanks, this looks very nice, some inline comments but mostly idle remarks, fine to land IMO. I have no good answer for your questions though. I agree that it feels better to keep a way to filter in the plugin and I think thats ok for part -> stage. There was some controversy about stage -> final (snap).

review: Approve
Revision history for this message
Sergio Schvezov (sergiusens) wrote :

@mvo, thanks for the review!

177. By Sergio Schvezov

escape char

178. By Sergio Schvezov

not so aggresive filtering for plugins or everything is included

Revision history for this message
Sergio Schvezov (sergiusens) wrote :

fixes from review

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches