From d03749ea98a4e9c13962c2691f1365a43b23cebf Mon Sep 17 00:00:00 2001
From: "Brian C. Lane" <bcl@redhat.com>
Date: Mon, 27 Sep 2021 09:08:37 -0700
Subject: [PATCH] Fix pylint warnings about string formatting

and one about unused exception value.

(cherry picked from commit f783ff77d4d3468f1efd4a5147e81d873ebd586b)
---
 src/bin/image-minimizer    | 2 +-
 src/sbin/livemedia-creator | 2 +-
 src/sbin/lorax             | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/bin/image-minimizer b/src/bin/image-minimizer
index 2f5da373..29387eb1 100755
--- a/src/bin/image-minimizer
+++ b/src/bin/image-minimizer
@@ -179,7 +179,7 @@ def main():
         minimizer.filter()
     except SystemExit as e:
         sys.exit(e.code)
-    except KeyboardInterrupt as e:
+    except KeyboardInterrupt:
         print("Aborted at user request")
 
 if __name__ == "__main__":
diff --git a/src/sbin/livemedia-creator b/src/sbin/livemedia-creator
index 541cfc65..cfd0ef09 100755
--- a/src/sbin/livemedia-creator
+++ b/src/sbin/livemedia-creator
@@ -115,7 +115,7 @@ def main():
         opts.image_type = "qcow2"
 
     if opts.image_type and not os.path.exists("/usr/bin/qemu-img"):
-        errors.append("image-type requires the qemu-img utility to be installed." % opts.image_type)
+        errors.append("image-type option requires the qemu-img utility to be installed.")
 
     if opts.image_type and opts.make_iso:
         errors.append("image-type cannot be used to make a bootable iso.")
diff --git a/src/sbin/lorax b/src/sbin/lorax
index 5f8fb882..40b90a94 100755
--- a/src/sbin/lorax
+++ b/src/sbin/lorax
@@ -170,14 +170,14 @@ def main():
     for kv in opts.add_template_vars:
         k, t, v = kv.partition('=')
         if t == '':
-            raise ValueError("Missing '=' for key=value in " % kv)
+            raise ValueError("Missing '=' for key=value in %s" % kv)
         parsed_add_template_vars[k] = v
 
     parsed_add_arch_template_vars = {}
     for kv in opts.add_arch_template_vars:
         k, t, v = kv.partition('=')
         if t == '':
-            raise ValueError("Missing '=' for key=value in " % kv)
+            raise ValueError("Missing '=' for key=value in %s" % kv)
         parsed_add_arch_template_vars[k] = v
 
     if 'SOURCE_DATE_EPOCH' in os.environ: