[blivet:master 4/4] Log exception information and disable W0703 warning.

mulhern amulhern at redhat.com
Thu Apr 17 20:18:52 UTC 2014


Signed-off-by: mulhern <amulhern at redhat.com>
---
 blivet/__init__.py     | 8 +++++++-
 blivet/deviceaction.py | 8 +++++++-
 blivet/iscsi.py        | 3 ++-
 3 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/blivet/__init__.py b/blivet/__init__.py
index 2b47a47..876ec55 100644
--- a/blivet/__init__.py
+++ b/blivet/__init__.py
@@ -2248,7 +2248,9 @@ class CryptTab(object):
                 try:
                     self.blkidTab = BlkidTab(chroot=chroot)
                     self.blkidTab.parse()
+                # pylint: disable=W0703
                 except Exception:
+                    log_exception_info(sys.exc_info(), fmt_str="failed to parse blkid.tab")
                     self.blkidTab = None
 
             for line in f.readlines():
@@ -2324,7 +2326,9 @@ def get_containing_device(path, devicetree):
 
     try:
         device_name = os.path.basename(os.readlink(link))
+    # pylint: disable=W0703
     except Exception:
+        log_exception_info(sys.exc_info(), fmt_str="failed to find device name for path %s", fmt_args=[path])
         return None
 
     if device_name.startswith("dm-"):
@@ -2685,7 +2689,9 @@ class FSSet(object):
 
             try:
                 device.setup()
-            except Exception as e:
+            # pylint: disable=W0703
+            except Exception:
+                log_exception_info(sys.exc_info(), fmt_str="unable to set up device %s", fmt_args=[device])
                 if errorHandler.cb(e) == ERROR_RAISE:
                     raise
                 else:
diff --git a/blivet/deviceaction.py b/blivet/deviceaction.py
index 4a50a1a..3eece88 100644
--- a/blivet/deviceaction.py
+++ b/blivet/deviceaction.py
@@ -20,6 +20,7 @@
 # Red Hat Author(s): Dave Lehman <dlehman at redhat.com>
 #
 
+
 from . import util
 
 from . import udev
@@ -27,12 +28,14 @@ from .devices import StorageDevice
 from .devices import PartitionDevice
 from .devices import LVMLogicalVolumeDevice
 from .formats import getFormat
+from .storage_log import log_exception_info
 from parted import partitionFlag, PARTITION_LBA
 from .i18n import _, N_
 
 import logging
 log = logging.getLogger("blivet")
 
+import sys
 from contextlib import contextmanager
 
 @contextmanager
@@ -335,8 +338,11 @@ class ActionDestroyDevice(DeviceAction):
         if self.device.partedDevice:
             try:
                 self.device.partedDevice.removeFromCache()
+            # pylint: disable=W0703
             except Exception:
-                pass
+                log_exception_info(sys.exc_info(),
+                   fmt_str="failed to remove info for device %s from libparted cache",
+                   fmt_args=[self.device])
 
     def requires(self, action):
         """ Return True if self requires action.
diff --git a/blivet/iscsi.py b/blivet/iscsi.py
index 96bbdf2..d2dc484 100644
--- a/blivet/iscsi.py
+++ b/blivet/iscsi.py
@@ -88,8 +88,9 @@ class iscsi(object):
                 initiatorname = libiscsi.get_firmware_initiator_name()
                 self._initiator = initiatorname
                 self.initiatorSet = True
+            # pylint: disable=W0703
             except Exception:
-                pass
+                log_exception_info(sys.exc_info(), fmt_str="failed to get initiator name from iscsi firmware")
 
     # So that users can write iscsi() to get the singleton instance
     def __call__(self):
-- 
1.8.3.1



More information about the anaconda-patches mailing list