Merge lp://qastaging/~mterry/snapcraft/lifecycle-fixes2 into lp://qastaging/~snappy-dev/snapcraft/core
Proposed by
Michael Terry
| Status: | Merged |
|---|---|
| Approved by: | Ricardo Salveti |
| Approved revision: | 75 |
| Merged at revision: | 73 |
| Proposed branch: | lp://qastaging/~mterry/snapcraft/lifecycle-fixes2 |
| Merge into: | lp://qastaging/~snappy-dev/snapcraft/core |
| Prerequisite: | lp://qastaging/~mterry/snapcraft/lifecycle-fixes |
| Diff against target: |
508 lines (+299/-27) 17 files modified
snapcraft/cmds.py (+36/-4) snapcraft/plugin.py (+7/-2) snapcraft/yaml.py (+73/-19) tests/plainbox/data/conflicts/Makefile (+8/-0) tests/plainbox/data/conflicts/snapcraft.yaml (+8/-0) tests/plainbox/data/conflicts/test.c (+4/-0) tests/plainbox/data/dependencies/p1/Makefile (+9/-0) tests/plainbox/data/dependencies/p1/p1.c (+4/-0) tests/plainbox/data/dependencies/p1/p1.h (+1/-0) tests/plainbox/data/dependencies/p2/Makefile (+9/-0) tests/plainbox/data/dependencies/p2/p2.c (+6/-0) tests/plainbox/data/dependencies/p2/p2.h (+1/-0) tests/plainbox/data/dependencies/p3/Makefile (+8/-0) tests/plainbox/data/dependencies/p3/p3.c (+7/-0) tests/plainbox/data/dependencies/snapcraft.yaml (+12/-0) tests/plainbox/units/jobs.pxu (+47/-2) tests/unit/test_cmds.py (+59/-0) |
| To merge this branch: | bzr merge lp://qastaging/~mterry/snapcraft/lifecycle-fixes2 |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Ricardo Salveti (community) | Approve | ||
|
Review via email:
|
|||
Commit message
Add collision detection before staging, fix ordering of parts to be more reliable, and only export the environment of dependent parts when building each part.
Description of the change
Add collision detection before staging, fix ordering of parts to be more reliable, and only export the environment of dependent parts when building each part.
This builds on the work in https:/
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 great, my comments would be for the stuff you already added as FIXME, so all good.