]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
Fix mixing of format() and %-interpolation
authorDan Mick <dan.mick@redhat.com>
Tue, 17 Apr 2018 01:37:30 +0000 (18:37 -0700)
committerAlfredo Deza <alfredo@deza.pe>
Fri, 20 Apr 2018 15:31:41 +0000 (11:31 -0400)
Signed-off-by: Dan Mick <dan.mick@redhat.com>
(cherry picked from commit 9e9a07c9ae41cc72e587dfd6551fd83389cc35e6)

src/ceph-volume/ceph_volume/api/lvm.py

index 7d24966659368567bef89f11fc18c13ecb7b53e9..88f0d2d2af6dd658662428a22d470f5332c9cf7b 100644 (file)
@@ -313,7 +313,7 @@ def remove_vg(vg_name):
     """
     Removes a volume group.
     """
-    fail_msg = "Unable to remove vg %s".format(vg_name)
+    fail_msg = "Unable to remove vg %s" % vg_name
     process.run(
         [
             'vgremove',
@@ -329,7 +329,7 @@ def remove_pv(pv_name):
     """
     Removes a physical volume.
     """
-    fail_msg = "Unable to remove vg %s".format(pv_name)
+    fail_msg = "Unable to remove vg %s" % pv_name
     process.run(
         [
             'pvremove',
@@ -359,7 +359,7 @@ def remove_lv(path):
         terminal_verbose=True,
     )
     if returncode != 0:
-        raise RuntimeError("Unable to remove %s".format(path))
+        raise RuntimeError("Unable to remove %s" % path)
     return True