From 0027ecc0fc5ad4212bad43938557d93aa5a5eef1 Mon Sep 17 00:00:00 2001 From: Eric Harney Date: Thu, 9 Mar 2023 10:10:13 -0500 Subject: [PATCH] RemoteFS: Fix messy string formatting backing_file_template is split in an unintuitive way, make this more cosmetically sensible. Change-Id: I994640c68d8c84946afca780ad988a2eaa86723d --- cinder/volume/drivers/remotefs.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cinder/volume/drivers/remotefs.py b/cinder/volume/drivers/remotefs.py index d026d40b6dc..11a2fb97deb 100644 --- a/cinder/volume/drivers/remotefs.py +++ b/cinder/volume/drivers/remotefs.py @@ -887,8 +887,8 @@ class RemoteFSSnapDriverBase(RemoteFSDriver): }) else: backing_file_template = \ - "(%(basedir)s/[0-9a-f]+/)?%" \ - "(volname)s(.(tmp-snap-)?[0-9a-f-]+)?%(valid_ext)s$" % { + "(%(basedir)s/[0-9a-f]+/)?" \ + "%(volname)s(.(tmp-snap-)?[0-9a-f-]+)?%(valid_ext)s$" % { 'basedir': basedir, 'volname': volume_name, 'valid_ext': valid_ext,