Merge lp://qastaging/~sergiusens/snapcraft/stage_snap_spec into lp://qastaging/~snappy-dev/snapcraft/core
Proposed by
Sergio Schvezov
| Status: | Merged |
|---|---|
| Approved by: | John Lenton |
| Approved revision: | 170 |
| Merged at revision: | 171 |
| Proposed branch: | lp://qastaging/~sergiusens/snapcraft/stage_snap_spec |
| Merge into: | lp://qastaging/~snappy-dev/snapcraft/core |
| Diff against target: |
186 lines (+55/-21) 4 files modified
snapcraft/cmds.py (+14/-4) snapcraft/plugin.py (+37/-14) snapcraft/tests/test_cmds.py (+2/-2) snapcraft/tests/test_plugin.py (+2/-1) |
| To merge this branch: | bzr merge lp://qastaging/~sergiusens/snapcraft/stage_snap_spec |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| John Lenton (community) | Approve | ||
|
Review via email:
|
|||
Commit message
Robustness for stage and snap which follow the spec more closely now
Description of the change
This uses self.installdir for file globbing to generate sets but it does not remove explicitly defined files which allows manual intervention in ./stage and for those 'staged' changes to migrate to snap (if part of the snap fileset).
There's better handling of dir create and file copy erroring out if somethig is missing.
This mechanism also allows us to always clean ./snap before the first part goes through its 'snap' lifecycle to ensure an always clean snap package.
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
lgtm.