]> 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)
committerDan Mick <dan.mick@redhat.com>
Tue, 17 Apr 2018 02:13:58 +0000 (19:13 -0700)
Signed-off-by: Dan Mick <dan.mick@redhat.com>
src/ceph-volume/ceph_volume/api/lvm.py

index 08d64ffaff89ccbe44e9c94e64a40389d4e3501c..328b887d09bad74d16c636bd6f4636657cbd45bc 100644 (file)
@@ -217,7 +217,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',
@@ -233,7 +233,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',
@@ -263,7 +263,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