[Autotest] [PATCH 6/8] software_manager: Replace catch all exceptions with specific exceptions

[Lucas Meneghel Rodrigues]

Yay for one more bad practice going away from this code...

Signed-off-by: Lucas Meneghel Rodrigues <l...@redhat.com>
---
 client/shared/software_manager.py | 34 +++++++++++++++++-----------------
 1 file changed, 17 insertions(+), 17 deletions(-)

diff --git a/client/shared/software_manager.py 
b/client/shared/software_manager.py
index 4459dfb..383086c 100755
--- a/client/shared/software_manager.py
+++ b/client/shared/software_manager.py
@@ -18,7 +18,7 @@ implement the given backend class.
 import os, re, logging, ConfigParser, optparse
 try:
     import yum
-except Exception:
+except ImportError:
     pass
 try:
     import autotest.common as common
@@ -67,7 +67,7 @@ class SystemInspector(object):
             try:
                 os_dep.command(high_level_pm)
                 list_supported.append(high_level_pm)
-            except Exception:
+            except ValueError:
                 pass
 
         pm_supported = None
@@ -353,7 +353,7 @@ class YumBackend(RpmBackend):
         try:
             utils.system(i_cmd)
             return True
-        except Exception:
+        except error.CmdError:
             return False
 
 
@@ -367,7 +367,7 @@ class YumBackend(RpmBackend):
         try:
             utils.system(r_cmd)
             return True
-        except Exception:
+        except error.CmdError:
             return False
 
 
@@ -418,7 +418,7 @@ class YumBackend(RpmBackend):
         try:
             utils.system(r_cmd)
             return True
-        except Exception:
+        except error.CmdError:
             return False
 
 
@@ -470,7 +470,7 @@ class ZypperBackend(RpmBackend):
         try:
             utils.system(i_cmd)
             return True
-        except Exception:
+        except error.CmdError:
             return False
 
 
@@ -484,7 +484,7 @@ class ZypperBackend(RpmBackend):
         try:
             utils.system(ar_cmd)
             return True
-        except Exception:
+        except error.CmdError:
             return False
 
 
@@ -498,7 +498,7 @@ class ZypperBackend(RpmBackend):
         try:
             utils.system(rr_cmd)
             return True
-        except Exception:
+        except error.CmdError:
             return False
 
 
@@ -511,7 +511,7 @@ class ZypperBackend(RpmBackend):
         try:
             utils.system(r_cmd)
             return True
-        except Exception:
+        except error.CmdError:
             return False
 
 
@@ -524,7 +524,7 @@ class ZypperBackend(RpmBackend):
         try:
             utils.system(u_cmd)
             return True
-        except Exception:
+        except error.CmdError:
             return False
 
 
@@ -554,7 +554,7 @@ class ZypperBackend(RpmBackend):
                 logging.info("Package %s provides %s", list_provides[0], name)
                 return list_provides[0]
             return None
-        except Exception:
+        except error.CmdError:
             return None
 
 
@@ -598,7 +598,7 @@ class AptBackend(DpkgBackend):
         try:
             utils.system(i_cmd)
             return True
-        except Exception:
+        except error.CmdError:
             return False
 
 
@@ -615,7 +615,7 @@ class AptBackend(DpkgBackend):
         try:
             utils.system(r_cmd)
             return True
-        except Exception:
+        except error.CmdError:
             return False
 
 
@@ -659,14 +659,14 @@ class AptBackend(DpkgBackend):
         ud_cmd = self.base_command + ' ' + ud_command
         try:
             utils.system(ud_cmd)
-        except Exception:
+        except error.CmdError:
             logging.error("Apt package update failed")
         up_command = 'upgrade'
         up_cmd = self.base_command + ' ' + up_command
         try:
             utils.system(up_cmd)
             return True
-        except Exception:
+        except error.CmdError:
             return False
 
 
@@ -685,7 +685,7 @@ class AptBackend(DpkgBackend):
         cache_update_cmd = command + ' update'
         try:
             utils.system(cache_update_cmd, ignore_status=True)
-        except Exception:
+        except error.CmdError:
             logging.error("Apt file cache update failed")
         fu_cmd = command + ' search ' + path
         try:
@@ -708,7 +708,7 @@ class AptBackend(DpkgBackend):
                 logging.info("Package %s provides %s", list_provides[0], path)
                 return list_provides[0]
             return None
-        except Exception:
+        except error.CmdError:
             return None
 
 
-- 
1.8.1.2

_______________________________________________
Autotest-kernel mailing list
Autotest-kernel@redhat.com
https://www.redhat.com/mailman/listinfo/autotest-kernel