Snapcraft

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

  1. collisions
  2. Merge into core
Proposed by Sergio Schvezov
Status: Merged
Approved by: Michael Vogt
Approved revision: 187
Merged at revision: 163
Proposed branch: lp://qastaging/~sergiusens/snapcraft/collisions
Merge into: lp://qastaging/~snappy-dev/snapcraft/core
Prerequisite: lp://qastaging/~sergiusens/snapcraft/docs
Diff against target: 153 lines (+39/-18)
3 files modified
snapcraft/cmds.py (+10/-12)
snapcraft/plugin.py (+24/-4)
snapcraft/tests/test_cmds.py (+5/-2)
To merge this branch: bzr merge lp://qastaging/~sergiusens/snapcraft/collisions
Reviewer Review Type Date Requested Status
Michael Vogt (community) Approve
Review via email: mp+270942@code.qastaging.launchpad.net

Commit message

Collision logic updates with an introduction of _BUILTIN_OPTIONS so all parts have a certain set of options by default even if not declared.

Description of the change

This basically changes collisions to take into account filesets and also check during staging AND snapping.

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

Thanks, this looks good.

review: Approve
lp://qastaging/~sergiusens/snapcraft/collisions updated
187. By Sergio Schvezov

keys with default values are better

Revision history for this message
Michael Vogt (mvo) wrote :

Nice!

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