]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
devices/simple/scan: Fix string in log statement 34446/head
authorJan Fajerski <jfajerski@suse.com>
Mon, 6 Apr 2020 08:51:27 +0000 (10:51 +0200)
committerJan Fajerski <jfajerski@suse.com>
Tue, 7 Apr 2020 13:40:50 +0000 (15:40 +0200)
A multiline string enclosed by () gained a comma, making it into a
tuple, which has no format() method.

Fixes: https://tracker.ceph.com/issues/44949
Signed-off-by: Jan Fajerski <jfajerski@suse.com>
(cherry picked from commit 292ae0305db3e48a87db45bcc7ca8cb837a08ead)

src/ceph-volume/ceph_volume/devices/simple/scan.py

index 6e41f76ecb19831c8beced8be78b9945788b6b3c..1e3deae4ce1ec8c14d566109c6ef9079cc35bc57 100644 (file)
@@ -103,8 +103,9 @@ class Scan(object):
             file_json_key = file_
             if file_.endswith('_dmcrypt'):
                 file_json_key = file_.rstrip('_dmcrypt')
-                logger.info(('reading file {}, stripping _dmcrypt',
-                             'suffix').format(file_))
+                logger.info(
+                    'reading file {}, stripping _dmcrypt suffix'.format(file_)
+                )
             if os.path.islink(file_path):
                 if os.path.exists(file_path):
                     osd_metadata[file_json_key] = self.scan_device(file_path)