pylint: narrow down too general exception catches

Signed-off-by: Ales Novak <alnovak@suse.com>

Author: alesax

nvmet/nvme.py

@@ -178,7 +178,7 @@ def set_attr(self, group, attribute, value):
         try:
             with open(path, 'w', encoding="utf-8") as file_fd:
                 file_fd.write(str(value))
-        except Exception as e:
+        except OSError as e:
             raise CFSError(f"Cannot set attribute {path}: {e}") from e
 
     def get_attr(self, group, attribute):
@@ -222,7 +222,7 @@ def set_enable(self, value):
         try:
             with open(path, 'w', encoding="utf-8") as file_fd:
                 file_fd.write(str(value))
-        except Exception as e:
+        except OSError as e:
             raise CFSError(f"Cannot enable {self.path}: {e} ({value})") from e
         self._enable = value
 
@@ -304,7 +304,7 @@ def _modprobe(self, modname):
             try:
                 kmod_ctypes.Kmod().modprobe(modname)
                 return
-            except Exception:
+            except OSError:
                 pass
 
         # Try the binary specified in /proc
@@ -315,7 +315,7 @@ def _modprobe(self, modname):
             if modprobe_cmd:
                 subprocess.run(shlex.split(modprobe_cmd) + [modname],
                                check=False)
-        except Exception:
+        except OSError:
             pass
 
     def _list_subsystems(self):
@@ -554,7 +554,7 @@ def add_allowed_host(self, nqn):
         try:
             os.symlink(f"{self.configfs_dir}/hosts/{nqn}",
                        f"{self._path}/allowed_hosts/{nqn}")
-        except Exception as e:
+        except OSError as e:
             raise CFSError(f"Could not symlink {nqn} in configFS: {e}") from e
 
     def remove_allowed_host(self, nqn):
@@ -563,7 +563,7 @@ def remove_allowed_host(self, nqn):
         '''
         try:
             os.unlink(f"{self._path}/allowed_hosts/{nqn}")
-        except Exception as e:
+        except OSError as e:
             raise CFSError(f"Could not unlink {nqn} in configFS: {e}") from e
 
     def has_passthru(self):
@@ -895,7 +895,7 @@ def add_subsystem(self, nqn):
         try:
             os.symlink(f"{self.configfs_dir}/subsystems/{nqn}",
                        f"{self._path}/subsystems/{nqn}")
-        except Exception as e:
+        except OSError as e:
             raise CFSError(f"Could not symlink {nqn} in configFS: {e}") from e
 
     def remove_subsystem(self, nqn):
@@ -904,7 +904,7 @@ def remove_subsystem(self, nqn):
         '''
         try:
             os.unlink(f"{self._path}/subsystems/{nqn}")
-        except Exception as e:
+        except OSError as e:
             raise CFSError(f"Could not unlink {nqn} in configFS: {e}") from e
 
     def delete(self):

nvmetcli

@@ -981,14 +981,14 @@ def main():
     try:
         shell = configshell.ConfigShell('~/.nvmetcli')
         UIRootNode(shell)
-    except Exception as msg:
+    except (nvme.CFSError, configshell.ExecutionError) as msg:
         shell.log.error(str(msg))
         return
 
     while not shell._exit:  # pylint: disable=protected-access
         try:
             shell.run_interactive()
-        except Exception as msg:
+        except (nvme.CFSError, configshell.ExecutionError) as msg:
             shell.log.error(str(msg))