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

[Dimitri John Ledkov]

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

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

[Dimitri John Ledkov (xnox)]

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

[Steve Langasek (vorlon)]

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

[Ryan Harper (raharper)]

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

[Dimitri John Ledkov (xnox)]

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.

[Dimitri John Ledkov (xnox)]

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

[Ryan Harper (raharper)]

Thanks!

review: Approve

[Server Team CI bot (server-team-bot)]

review: Approve (continuous-integration)

diff --git a/curtin/block/deps.py b/curtin/block/deps.py
index 930f764..38581a8 100644
--- a/curtin/block/deps.py
+++ b/curtin/block/deps.py
@@ -58,7 +58,7 @@ def detect_required_packages_mapping(osfamily=DISTROS.debian):
     distro_mapping = {
         DISTROS.debian: {
             'bcache': ['bcache-tools'],
-            'btrfs': ['btrfs-tools'],
+            'btrfs': ['^btrfs-(progs|tools)$'],
             'ext2': ['e2fsprogs'],
             'ext3': ['e2fsprogs'],
             'ext4': ['e2fsprogs'],
diff --git a/curtin/deps/__init__.py b/curtin/deps/__init__.py
index 37c4469..714ef18 100644
--- a/curtin/deps/__init__.py
+++ b/curtin/deps/__init__.py
@@ -25,7 +25,7 @@ REQUIRED_EXECUTABLES = [
     ('lvcreate', 'lvm2'),
     ('mdadm', 'mdadm'),
     ('mkfs.vfat', 'dosfstools'),
-    ('mkfs.btrfs', 'btrfs-tools'),
+    ('mkfs.btrfs', '^btrfs-(progs|tools)$'),
     ('mkfs.ext4', 'e2fsprogs'),
     ('mkfs.xfs', 'xfsprogs'),
     ('partprobe', 'parted'),
diff --git a/debian/control b/debian/control
index c2de623..1b4aee5 100644
--- a/debian/control
+++ b/debian/control
@@ -29,7 +29,7 @@ Package: curtin
 Architecture: all
 Priority: extra
 Depends: bcache-tools,
-         btrfs-tools,
+         btrfs-progs | btrfs-tools,
          dosfstools,
          file,
          gdisk,
diff --git a/tests/unittests/test_curthooks.py b/tests/unittests/test_curthooks.py
index e7d506e..d5bebe7 100644
--- a/tests/unittests/test_curthooks.py
+++ b/tests/unittests/test_curthooks.py
@@ -738,7 +738,7 @@ class TestDetectRequiredPackages(CiTestCase):
             ({'storage': {
                 'version': 1,
                 'items': ('lvm_partition', 'lvm_volgroup', 'btrfs', 'xfs')}},
-             ('lvm2', 'xfsprogs', 'btrfs-tools')),
+             ('lvm2', 'xfsprogs', '^btrfs-(progs|tools)$')),
             ({'storage': {
                 'version': 1,
                 'items': ('raid', 'bcache', 'ext3', 'xfs')}},
@@ -747,7 +747,7 @@ class TestDetectRequiredPackages(CiTestCase):
                 'version': 1,
                 'items': ('raid', 'lvm_volgroup', 'lvm_partition', 'ext3',
                           'ext4', 'btrfs')}},
-             ('lvm2', 'mdadm', 'e2fsprogs', 'btrfs-tools')),
+             ('lvm2', 'mdadm', 'e2fsprogs', '^btrfs-(progs|tools)$')),
             ({'storage': {
                 'version': 1,
                 'items': ('bcache', 'lvm_volgroup', 'lvm_partition', 'ext2')}},
@@ -796,7 +796,7 @@ class TestDetectRequiredPackages(CiTestCase):
               'network': {
                   'version': 1,
                   'items': ('bond', 'vlan')}},
-             ('e2fsprogs', 'btrfs-tools', 'vlan', 'ifenslave')),
+             ('e2fsprogs', '^btrfs-(progs|tools)$', 'vlan', 'ifenslave')),
         ))
 
     def test_network_v2_detect(self):