From: Michael Prokop <mika@grml.org>
Date: Thu, 18 Jun 2020 15:44:11 +0000 (+0200)
Subject: codecheck: fix flake8 issues with versions >=3.8.3
X-Git-Tag: v0.18.3~7
X-Git-Url: http://git.grml.org/?p=grml2usb.git;a=commitdiff_plain;h=9e7dd969c917d32365f2acb714c5c28e9c450dd3

codecheck: fix flake8 issues with versions >=3.8.3

Fixes:

| grml2usb:920:17: F523 '...'.format(...) has unused arguments at position(s): 0
| grml2usb:1954:57: E741 ambiguous variable name 'l'

Thanks: Florian Apolloner for feedback
---

diff --git a/grml2usb b/grml2usb
index 749fcd1..223dae2 100755
--- a/grml2usb
+++ b/grml2usb
@@ -918,7 +918,7 @@ def mount(source, target, mount_options):
         if x.startswith(source):
             raise CriticalException(
                 (
-                    "Error executing mount: %s already mounted - "
+                    "Error executing mount: {0} already mounted - "
                     "please unmount before invoking grml2usb"
                 ).format(source)
             )
@@ -1953,7 +1953,7 @@ def handle_mbr(device):
                 break
 
         if not mbrcode:
-            str_locations = " or ".join(['"%s"' % l for l in mbr_locations])
+            str_locations = " or ".join(['"%s"' % x for x in mbr_locations])
             logging.error("Cannot find syslinux MBR, install it at %s)", str_locations)
             raise CriticalException(
                 "syslinux MBR  can not be found at %s." % str_locations