[PATCH blivet] Fix a couple new pylint errors.

Chris Lumens clumens at redhat.com
Tue Oct 13 13:59:47 UTC 2015


---
 blivet/devicelibs/edd.py | 6 +++---
 blivet/devicetree.py     | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/blivet/devicelibs/edd.py b/blivet/devicelibs/edd.py
index 7018a82..6f6da12 100644
--- a/blivet/devicelibs/edd.py
+++ b/blivet/devicelibs/edd.py
@@ -434,9 +434,9 @@ class EddMatcher(object):
         elif len(matching_paths) > 1:
             log.error("edd: Too many devices match for pci dev "\
                         "%(pci_dev)s channel %(chan)s scsi "\
-                        "id %(dev)s lun %(lun)s: " % args)
+                        "id %(dev)s lun %(lun)s: ", args)
             for matching_path in matching_paths:
-                log.error("edd:   %s" % (matching_path,))
+                log.error("edd:   %s", matching_path)
         elif len(matching_paths) == 1 and os.path.exists(matching_paths[0]):
             block_entries = os.listdir(matching_paths[0])
             if len(block_entries) == 1:
@@ -447,7 +447,7 @@ class EddMatcher(object):
         else:
             log.warning("edd: Could not find SCSI device for pci dev "\
                         "%(pci_dev)s channel %(chan)s scsi "\
-                        "id %(dev)s lun %(lun)s" % args)
+                        "id %(dev)s lun %(lun)s", args)
         return name
 
     def devname_from_virt_pci_dev(self):
diff --git a/blivet/devicetree.py b/blivet/devicetree.py
index 274fc0d..dac8e21 100644
--- a/blivet/devicetree.py
+++ b/blivet/devicetree.py
@@ -935,7 +935,7 @@ class DeviceTree(object):
         elif re.match(r'(0x)?[A-Za-z0-9]{2}(p\d+)?$', devspec):
             # BIOS drive number
             spec = int(devspec, 16)
-            for (edd_name, edd_number) in edd.edd_dict.items():
+            for (edd_name, edd_number) in edd.get_edd_dict(self.devices).items():
                 if edd_number == spec:
                     device = self.getDeviceByName(edd_name)
                     break
-- 
2.4.3



More information about the anaconda-patches mailing list