From f5530b5074faa4cc6bbd4c0ad2aaf9352cb74c81 Mon Sep 17 00:00:00 2001 From: Yann Dirson Date: Fri, 22 Dec 2023 09:15:10 +0100 Subject: [PATCH] fixup! Keep user multipath configuration upon upgrade 're' key in restore_list takes a compiled regexp, not a string. Signed-off-by: Yann Dirson --- upgrade.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/upgrade.py b/upgrade.py index 9bf45b77..2d975fbb 100644 --- a/upgrade.py +++ b/upgrade.py @@ -449,7 +449,7 @@ def buildRestoreList(self): self.restore_list += ['etc/nagios/nrpe.cfg', {'dir': 'etc/nrpe.d'}] # Keep user multipath configuration - self.restore_list += [{'dir': 'etc/multipath/conf.d', 're': r'custom.*\.conf'}] + self.restore_list += [{'dir': 'etc/multipath/conf.d', 're': re.compile(r'custom.*\.conf')}] completeUpgradeArgs = ['mounts', 'installation-to-overwrite', 'primary-disk', 'backup-partnum', 'logs-partnum', 'net-admin-interface', 'net-admin-bridge', 'net-admin-configuration'] def completeUpgrade(self, mounts, prev_install, target_disk, backup_partnum, logs_partnum, admin_iface, admin_bridge, admin_config):