public inbox for git-commits@fedoraproject.org
help / color / mirror / Atom feed
* [rpms/python-blivet] rawhide: Remove old unused patches
@ 2026-09-24 13:09 Vojtech Trefny
0 siblings, 0 replies; only message in thread
From: Vojtech Trefny @ 2026-09-24 13:09 UTC (permalink / raw)
To: git-commits
A new commit has been pushed.
Repo : rpms/python-blivet
Branch : rawhide
Commit : ddc656ddf0abbffcdb4f60aa24b401e93d989f08
Author : Vojtech Trefny <vtrefny@redhat.com>
Date : 2026-09-24T14:35:54+02:00
Stats : +0/-330 in 4 file(s)
URL : https://src.fedoraproject.org/rpms/python-blivet/c/ddc656ddf0abbffcdb4f60aa24b401e93d989f08?branch=rawhide
Log:
Remove old unused patches
---
diff --git a/0002-Fix-extra-mount-options-for-Stratis-filesystems-in-fstab.patch b/0002-Fix-extra-mount-options-for-Stratis-filesystems-in-fstab.patch
deleted file mode 100644
index 3799b54..0000000
--- a/0002-Fix-extra-mount-options-for-Stratis-filesystems-in-fstab.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From 9b5f72aa0e24b3d8ca21920f0d0bd2abd0e620f1 Mon Sep 17 00:00:00 2001
-From: Vojtech Trefny <vtrefny@redhat.com>
-Date: Fri, 14 Aug 2026 07:39:59 +0200
-Subject: [PATCH] Fix extra mount options for Stratis filesystems in fstab
-
-Missing ".service" in the x-systemd options.
----
- blivet/formats/fs.py | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/blivet/formats/fs.py b/blivet/formats/fs.py
-index 024c6cbbf..916eaf742 100644
---- a/blivet/formats/fs.py
-+++ b/blivet/formats/fs.py
-@@ -1255,9 +1255,9 @@ def __init__(self, **kwargs):
- def _get_options(self):
- opts = super(StratisXFS, self)._get_options()
- if self.mountpoint != "/":
-- stratis_opts = "x-systemd.requires=stratis-fstab-setup@%s," \
-- "x-systemd.after=stratis-fstab-setup@%s" % (self.pool_uuid,
-- self.pool_uuid)
-+ stratis_opts = "x-systemd.requires=stratis-fstab-setup@%s.service," \
-+ "x-systemd.after=stratis-fstab-setup@%s.service" % (self.pool_uuid,
-+ self.pool_uuid)
- else:
- stratis_opts = None
- return ",".join(o for o in (opts, stratis_opts) if o)
diff --git a/0002-Fix-luks-save_passphrase-for-missing-format-context.patch b/0002-Fix-luks-save_passphrase-for-missing-format-context.patch
deleted file mode 100644
index 8138e87..0000000
--- a/0002-Fix-luks-save_passphrase-for-missing-format-context.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-From a82ab0801d9dc4bc8e5dbefb92fe2cba1021fedf Mon Sep 17 00:00:00 2001
-From: Radek Vykydal <rvykydal@redhat.com>
-Date: Fri, 24 Oct 2025 14:04:36 +0200
-Subject: [PATCH 1/2] Fix luks save_passphrase for missing format context
-
----
- blivet/static_data/luks_data.py | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/blivet/static_data/luks_data.py b/blivet/static_data/luks_data.py
-index 3e4cc2a0e..6bb9d1399 100644
---- a/blivet/static_data/luks_data.py
-+++ b/blivet/static_data/luks_data.py
-@@ -86,7 +86,7 @@ def add_passphrases(self, passphrases):
- def save_passphrase(self, device):
- """ Save a device's LUKS passphrase in case of reset. """
- pctx = device.format.contexts.get_context("passphrase")
-- passphrase = pctx._passphrase
-+ passphrase = pctx and pctx._passphrase
- if passphrase:
- luks_data.luks_devs[device.format.uuid] = passphrase
- self.add_passphrase(passphrase)
-
-From d5dbcabbbc7fa353433e50e3e6dfe4a9dc7af6aa Mon Sep 17 00:00:00 2001
-From: Vojtech Trefny <vtrefny@redhat.com>
-Date: Wed, 29 Oct 2025 10:20:32 +0100
-Subject: [PATCH 2/2] tests: Add check for saving passphrase with context not
- set
-
----
- tests/storage_tests/formats_test/luks_test.py | 4 ++++
- 1 file changed, 4 insertions(+)
-
-diff --git a/tests/storage_tests/formats_test/luks_test.py b/tests/storage_tests/formats_test/luks_test.py
-index b42cacddd..3eb62ba66 100644
---- a/tests/storage_tests/formats_test/luks_test.py
-+++ b/tests/storage_tests/formats_test/luks_test.py
-@@ -304,6 +304,10 @@ def test_luks_save_passphrase(self):
- self.assertIsNotNone(disk)
- self.assertTrue(disk.format.has_key)
-
-+ # remove passphrase and try to save it (should not fail)
-+ disk.format.passphrase = None
-+ blivet.static_data.luks_data.save_passphrase(disk)
-+
- def test_label_subsystem(self):
- disk = self.storage.devicetree.get_device_by_path(self.vdevs[0])
- self.assertIsNotNone(disk)
diff --git a/0002-Ignore-btrfs-mount-errors-during-storage-scan.patch b/0002-Ignore-btrfs-mount-errors-during-storage-scan.patch
deleted file mode 100644
index 4bea79e..0000000
--- a/0002-Ignore-btrfs-mount-errors-during-storage-scan.patch
+++ /dev/null
@@ -1,214 +0,0 @@
-From 8a3b0a66c2bddeabc9785b9a625b80cd491f1e98 Mon Sep 17 00:00:00 2001
-From: Vojtech Trefny <vtrefny@redhat.com>
-Date: Tue, 10 Mar 2026 13:30:06 +0100
-Subject: [PATCH 1/2] btrfs: Fix _get_default_subvolume_id passing None
- mountpoint
-
-In the auto_dev_updates branch, mountpoint was None (the preceding
-"if mountpoint:" check had failed). Use _do_temp_mount() to get a
-valid mountpoint, matching the pattern used elsewhere in the class.
-
-Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
----
- blivet/devices/btrfs.py | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/blivet/devices/btrfs.py b/blivet/devices/btrfs.py
-index 791a1687..71f7dfdd 100644
---- a/blivet/devices/btrfs.py
-+++ b/blivet/devices/btrfs.py
-@@ -420,7 +420,8 @@ class BTRFSVolumeDevice(BTRFSDevice, ContainerDevice, RaidDevice):
- if mountpoint:
- subvolid = blockdev.btrfs.get_default_subvolume_id(mountpoint)
- elif flags.auto_dev_updates:
-- subvolid = blockdev.btrfs.get_default_subvolume_id(mountpoint)
-+ with self._do_temp_mount() as tmp_mountpoint:
-+ subvolid = blockdev.btrfs.get_default_subvolume_id(tmp_mountpoint)
- except (blockdev.BtrfsError, blockdev.BlockDevNotImplementedError) as e:
- log.debug("failed to get default subvolume id: %s", e)
-
---
-2.53.0
-
-
-From 7cc6724c6ff9a182aa73060c236001d1da59e06a Mon Sep 17 00:00:00 2001
-From: Vojtech Trefny <vtrefny@redhat.com>
-Date: Fri, 17 Apr 2026 12:23:02 +0200
-Subject: [PATCH 2/2] Ignore btrfs mount errors during storage scan (#2458901)
-
-With don't want to fail just because we can't get information
-about existing btrfs (sub)volumes.
-
-Originally the mount errors were silently ignored because we did
-not check the mount command return code, this broke in a0ba8ac
-when we started using libblockdev for the mount operation which
-raises exception.
----
- blivet/devices/btrfs.py | 6 +-
- .../storage_tests/devices_test/btrfs_test.py | 95 ++++++++++---------
- 2 files changed, 53 insertions(+), 48 deletions(-)
-
-diff --git a/blivet/devices/btrfs.py b/blivet/devices/btrfs.py
-index 71f7dfdd..a153ebcb 100644
---- a/blivet/devices/btrfs.py
-+++ b/blivet/devices/btrfs.py
-@@ -405,8 +405,8 @@ class BTRFSVolumeDevice(BTRFSDevice, ContainerDevice, RaidDevice):
- with self._do_temp_mount(orig=True) as mountpoint:
- subvols = self._list_subvolumes(mountpoint=mountpoint,
- snapshots_only=snapshots_only)
-- except errors.FSError:
-- pass
-+ except (errors.FSError, errors.BTRFSError) as e:
-+ log.debug("failed to list subvolumes: %s", e)
-
- return subvols
-
-@@ -422,7 +422,7 @@ class BTRFSVolumeDevice(BTRFSDevice, ContainerDevice, RaidDevice):
- elif flags.auto_dev_updates:
- with self._do_temp_mount() as tmp_mountpoint:
- subvolid = blockdev.btrfs.get_default_subvolume_id(tmp_mountpoint)
-- except (blockdev.BtrfsError, blockdev.BlockDevNotImplementedError) as e:
-+ except (blockdev.BtrfsError, blockdev.BlockDevNotImplementedError, errors.BTRFSError) as e:
- log.debug("failed to get default subvolume id: %s", e)
-
- self._default_subvolume_id = subvolid
-diff --git a/tests/storage_tests/devices_test/btrfs_test.py b/tests/storage_tests/devices_test/btrfs_test.py
-index 5e09bc8c..2b8d0457 100644
---- a/tests/storage_tests/devices_test/btrfs_test.py
-+++ b/tests/storage_tests/devices_test/btrfs_test.py
-@@ -37,21 +37,28 @@ class BtrfsTestCase(StorageTestCase):
-
- return super()._clean_up()
-
-- def test_btrfs_basic(self):
-- disk = self.storage.devicetree.get_device_by_path(self.vdevs[0])
-- self.assertIsNotNone(disk)
-+ def _create_btrfs_volume(self, disks, raid_level=None):
-+ parents = []
-+ for disk_path in disks:
-+ disk = self.storage.devicetree.get_device_by_path(disk_path)
-+ self.assertIsNotNone(disk)
-
-- self.storage.initialize_disk(disk)
-+ self.storage.initialize_disk(disk)
-
-- part = self.storage.new_partition(size=blivet.size.Size("1 GiB"), fmt_type="btrfs",
-- parents=[disk])
-- self.storage.create_device(part)
-+ part = self.storage.new_partition(size=blivet.size.Size("1 GiB"), fmt_type="btrfs",
-+ parents=[disk])
-+ self.storage.create_device(part)
-
-- blivet.partitioning.do_partitioning(self.storage)
-+ blivet.partitioning.do_partitioning(self.storage)
-+ parents.append(part)
-
-- vol = self.storage.new_btrfs(name=self.volname, parents=[part])
-+ vol = self.storage.new_btrfs(name=self.volname, parents=parents,
-+ data_level=raid_level, metadata_level=raid_level)
- self.storage.create_device(vol)
-+ return vol
-
-+ def test_btrfs_basic(self):
-+ vol = self._create_btrfs_volume(disks=[self.vdevs[0]])
- self.assertIsNotNone(vol.uuid)
- pre_uuid = vol.uuid
-
-@@ -94,27 +101,7 @@ class BtrfsTestCase(StorageTestCase):
- self.assertEqual(sub.format.subvolspec, sub.name)
-
- def _test_btrfs_raid(self, raid_level):
-- disk1 = self.storage.devicetree.get_device_by_path(self.vdevs[0])
-- self.assertIsNotNone(disk1)
-- self.storage.initialize_disk(disk1)
--
-- disk2 = self.storage.devicetree.get_device_by_path(self.vdevs[1])
-- self.assertIsNotNone(disk2)
-- self.storage.initialize_disk(disk2)
--
-- part1 = self.storage.new_partition(size=blivet.size.Size("1 GiB"), fmt_type="btrfs",
-- parents=[disk1])
-- self.storage.create_device(part1)
--
-- part2 = self.storage.new_partition(size=blivet.size.Size("1 GiB"), fmt_type="btrfs",
-- parents=[disk2])
-- self.storage.create_device(part2)
--
-- blivet.partitioning.do_partitioning(self.storage)
--
-- vol = self.storage.new_btrfs(name=self.volname, parents=[part1, part2],
-- data_level=raid_level, metadata_level=raid_level)
-- self.storage.create_device(vol)
-+ vol = self._create_btrfs_volume(disks=[self.vdevs[0], self.vdevs[1]], raid_level=raid_level)
-
- sub = self.storage.new_btrfs_sub_volume(parents=[vol], name="blivetTestSubVol")
- self.storage.create_device(sub)
-@@ -130,7 +117,6 @@ class BtrfsTestCase(StorageTestCase):
- self.assertEqual(vol.format.type, "btrfs")
- self.assertEqual(vol.format.container_uuid, vol.uuid)
- self.assertEqual(len(vol.parents), 2)
-- self.assertCountEqual([p.name for p in vol.parents], [part1.name, part2.name])
-
- def test_btrfs_raid_single(self):
- self._test_btrfs_raid(blivet.devicelibs.raid.Single)
-@@ -142,20 +128,7 @@ class BtrfsTestCase(StorageTestCase):
- self._test_btrfs_raid(blivet.devicelibs.raid.RAID1)
-
- def test_btrfs_fs_is_empty(self):
-- disk = self.storage.devicetree.get_device_by_path(self.vdevs[0])
-- self.assertIsNotNone(disk)
--
-- self.storage.initialize_disk(disk)
--
-- part = self.storage.new_partition(size=blivet.size.Size("1 GiB"), fmt_type="btrfs",
-- parents=[disk])
-- self.storage.create_device(part)
--
-- blivet.partitioning.do_partitioning(self.storage)
--
-- vol = self.storage.new_btrfs(name=self.volname, parents=[part])
-- self.storage.create_device(vol)
--
-+ vol = self._create_btrfs_volume(disks=[self.vdevs[0]])
- self.assertIsNotNone(vol.uuid)
-
- sub1 = self.storage.new_btrfs_sub_volume(parents=[vol], name="blivetTestSubVol1")
-@@ -200,3 +173,35 @@ class BtrfsTestCase(StorageTestCase):
- sub3 = self.storage.devicetree.get_device_by_name("blivetTestSubVol2/blivetTestSubVol3")
- self.assertIsNotNone(sub3)
- self.assertTrue(sub3.format.is_empty)
-+
-+ def test_btrfs_partial(self):
-+ vol = self._create_btrfs_volume(disks=[self.vdevs[0], self.vdevs[1]])
-+
-+ sub = self.storage.new_btrfs_sub_volume(parents=[vol], name="blivetTestSubVol")
-+ self.storage.create_device(sub)
-+
-+ self.storage.do_it()
-+ self.storage.reset()
-+
-+ # wipe the second disk to create a broken btrfs volume
-+ blivet.util.run_program(["wipefs", "-a", self.vdevs[1]])
-+
-+ # reset shouldn't fail (failing to mount the volume during reset is not critical error)
-+ self.storage.reset()
-+
-+ # volume should be in the tree
-+ vol = self.storage.devicetree.get_device_by_name(self.volname)
-+ self.assertIsNotNone(vol)
-+
-+ # but no subvolumes (mount to get information fails)
-+ self.assertFalse(vol.children)
-+
-+ # and only one parent
-+ self.assertEqual(len(vol.parents), 1)
-+
-+ # adding a subvolume fails -> active operation, mount fail is not ignored
-+ sub = self.storage.new_btrfs_sub_volume(parents=[vol], name="blivetTestSubVol")
-+ self.storage.create_device(sub)
-+
-+ with self.assertRaisesRegex(blivet.errors.BTRFSError, "failed to temporarily mount .* for btrfs operation"):
-+ self.storage.do_it()
---
-2.53.0
-
diff --git a/0003-When-starting-stratis-pool-always-call-StartPool-with-FD-list.patch b/0003-When-starting-stratis-pool-always-call-StartPool-with-FD-list.patch
deleted file mode 100644
index 1bd7e7a..0000000
--- a/0003-When-starting-stratis-pool-always-call-StartPool-with-FD-list.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-From 6a405e63bee0d3223d2cac5ae2d7c57c3fd20984 Mon Sep 17 00:00:00 2001
-From: Vojtech Trefny <vtrefny@redhat.com>
-Date: Thu, 14 May 2026 17:11:20 +0200
-Subject: [PATCH] When starting stratis pool always call StartPool with FD list
-
-Stratis 3.9.0 switched to zbus which seems to be more strict when
-validating parameters and requires the file destriptor list to be
-always present, even when not used e.g. when "unlock_method" is
-set to False for StartPool.
-Using the GLibClientUnix client makes sure the FD list is passed
-to the DBus call and we also need to set a valid index to the
-list instead of -1.
----
- blivet/devicelibs/stratis.py | 7 ++++---
- 1 file changed, 4 insertions(+), 3 deletions(-)
-
-diff --git a/blivet/devicelibs/stratis.py b/blivet/devicelibs/stratis.py
-index e91c355bf..85694a198 100644
---- a/blivet/devicelibs/stratis.py
-+++ b/blivet/devicelibs/stratis.py
-@@ -194,7 +194,7 @@ def _unlock_pool_new(pool_uuid, method=None, passphrase=None, keyfile=None):
-
- key_arg = (True, UnixFD(fd))
- else:
-- key_arg = (False, -1)
-+ key_arg = (False, 0)
-
- try:
- proxy = util.SystemBus.get_proxy(STRATIS_SERVICE, STRATIS_PATH, STRATIS_MANAGER_INTF_R8,
-@@ -360,8 +360,9 @@ def start_pool(pool_uuid):
- stratis_info.drop_cache()
-
- try:
-- proxy = util.SystemBus.get_proxy(STRATIS_SERVICE, STRATIS_PATH, STRATIS_MANAGER_INTF_R8)
-- ((succ, _uuid), rc, err) = proxy.StartPool(pool_uuid, "uuid", (False, (False, 0)), (False, -1),
-+ proxy = util.SystemBus.get_proxy(STRATIS_SERVICE, STRATIS_PATH, STRATIS_MANAGER_INTF_R8,
-+ client=GLibClientUnix)
-+ ((succ, _uuid), rc, err) = proxy.StartPool(pool_uuid, "uuid", (False, (False, 0)), (False, 0),
- timeout=STRATIS_CALL_TIMEOUT)
- except DBusError as e:
- raise StratisError("Failed to start stratis pool '%s': %s" % (pool_uuid, str(e)))
^ permalink raw reply related [flat|nested] only message in thread
only message in thread, other threads:[~2026-09-24 13:09 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2026-09-24 13:09 [rpms/python-blivet] rawhide: Remove old unused patches Vojtech Trefny
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox