From: Dan Mick <dan.mick@redhat.com>
Date: Tue, 17 Apr 2018 01:37:30 +0000 (-0700)
Subject: Fix mixing of format() and %-interpolation
X-Git-Tag: v12.2.5~1^2~1
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=837bd8ffb1cec98e9aa515ee466545a54816416a;p=ceph.git

Fix mixing of format() and %-interpolation

Signed-off-by: Dan Mick <dan.mick@redhat.com>
(cherry picked from commit 9e9a07c9ae41cc72e587dfd6551fd83389cc35e6)
---

diff --git a/src/ceph-volume/ceph_volume/api/lvm.py b/src/ceph-volume/ceph_volume/api/lvm.py
index 7d2496665936..88f0d2d2af6d 100644
--- a/src/ceph-volume/ceph_volume/api/lvm.py
+++ b/src/ceph-volume/ceph_volume/api/lvm.py
@@ -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