Skip to content

Commit f5530b5

Browse files
committed
fixup! Keep user multipath configuration upon upgrade
're' key in restore_list takes a compiled regexp, not a string. Signed-off-by: Yann Dirson <yann.dirson@vates.fr>
1 parent 08059cf commit f5530b5

1 file changed

Lines changed: 1 addition & 1 deletion

File tree

upgrade.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -449,7 +449,7 @@ def buildRestoreList(self):
449449
self.restore_list += ['etc/nagios/nrpe.cfg', {'dir': 'etc/nrpe.d'}]
450450

451451
# Keep user multipath configuration
452-
self.restore_list += [{'dir': 'etc/multipath/conf.d', 're': r'custom.*\.conf'}]
452+
self.restore_list += [{'dir': 'etc/multipath/conf.d', 're': re.compile(r'custom.*\.conf')}]
453453

454454
completeUpgradeArgs = ['mounts', 'installation-to-overwrite', 'primary-disk', 'backup-partnum', 'logs-partnum', 'net-admin-interface', 'net-admin-bridge', 'net-admin-configuration']
455455
def completeUpgrade(self, mounts, prev_install, target_disk, backup_partnum, logs_partnum, admin_iface, admin_bridge, admin_config):

0 commit comments

Comments
 (0)