Merge ~xnox/curtin:btrfs-progs into curtin:master

Proposed by Dimitri John Ledkov
Status: Merged
Approved by: Dan Watkins
Approved revision: 64f64bef0ad081cb86159b7fbbd683cfc425b76f
Merge reported by: Server Team CI bot
Merged at revision: not available
Proposed branch: ~xnox/curtin:btrfs-progs
Merge into: curtin:master
Diff against target: 70 lines (+6/-6)
4 files modified
curtin/block/deps.py (+1/-1)
curtin/deps/__init__.py (+1/-1)
debian/control (+1/-1)
tests/unittests/test_curthooks.py (+3/-3)
Reviewer Review Type Date Requested Status
Server Team CI bot continuous-integration Approve
Ryan Harper (community) Approve
Steve Langasek (community) Needs Fixing
Julian Andres Klode Pending
Review via email: mp+371105@code.launchpad.net

Commit message

Switch to the new btrfs-progs package name, with btrfs-tools fallback.

Description of the change

Switch to the new btrfs-progs package name, with btrfs-tools fallback.

To post a comment you must log in.
Revision history for this message
Dimitri John Ledkov (xnox) wrote :

Currently the new btrfs-progs has dropped Provides btrfs-tools and is stuck in eoan-proposed, because curtin still relies on btrfs-tools package.

Revision history for this message
Steve Langasek (vorlon) wrote :

Feedback inline. Otherwise I have no objections, although Julian seemed to suggest people should not rely on apt's support for regex matching.

review: Needs Fixing
Revision history for this message
Ryan Harper (raharper) wrote :

Neat; I didn't know you could do matching.

Revision history for this message
Dimitri John Ledkov (xnox) wrote :

I am introducing `+Provides: btrfs-progs` in xenial, meaning that one can use future-proof name in xenial.

I do wonder if this is enough, or if we still allow to deploy trusty with xenail's curtin. If we do, we still need matching there.

Revision history for this message
Dimitri John Ledkov (xnox) wrote :

Updated with more strict regexp, retested that it works on stock xenial. This is now ready to merge / ship.

Revision history for this message
Ryan Harper (raharper) wrote :

Thanks!

review: Approve
Revision history for this message
Server Team CI bot (server-team-bot) :
review: Approve (continuous-integration)

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