update ipmihelper.py

sonic-net · Feb 2, 2021 · 6dab168 · 6dab168
1 parent 4e1f3a1
commit 6dab168
Showing 1 changed file with 8 additions and 8 deletions.
diff --git a/platform/broadcom/sonic-platform-modules-dell/common/ipmihelper.py b/platform/broadcom/sonic-platform-modules-dell/common/ipmihelper.py
@@ -33,12 +33,12 @@ def get_ipmitool_raw_output(args):
     command = "ipmitool raw {}".format(args)
     try:
         proc = subprocess.Popen(command.split(), stdout=subprocess.PIPE,
-                                universal_newlines=True,stderr=subprocess.STDOUT)
+                                universal_newlines=True, stderr=subprocess.STDOUT)
         stdout = proc.communicate()[0]
         proc.wait()
         if not proc.returncode:
             result = stdout.rstrip('\n')
-    except:
+    except EnvironmentError:
         pass
 
     for i in result.split():
@@ -175,12 +175,12 @@ def _get_ipmitool_fru_print(self):
         command = "ipmitool fru print {}".format(self.id)
         try:
             proc = subprocess.Popen(command.split(), stdout=subprocess.PIPE,
-                                    universal_newlines=True,stderr=subprocess.STDOUT)
+                                    universal_newlines=True, stderr=subprocess.STDOUT)
             stdout = proc.communicate()[0]
             proc.wait()
             if not proc.returncode:
-                result = stdout.decode('utf-8').rstrip('\n')
-        except:
+                result = stdout.rstrip('\n')
+        except EnvironmentError:
             pass
 
         return result
@@ -248,12 +248,12 @@ def get_fru_data(self, offset, count=1):
                                                           offset_MSB, count)
         try:
             proc = subprocess.Popen(command.split(), stdout=subprocess.PIPE,
-                                    universal_newlines=True,stderr=subprocess.STDOUT)
+                                    universal_newlines=True, stderr=subprocess.STDOUT)
             stdout = proc.communicate()[0]
             proc.wait()
             if not proc.returncode:
-                result = stdout.decode('utf-8').rstrip('\n')
-        except:
+                result = stdout.rstrip('\n')
+        except EnvironmentError:
             is_valid = False
 
         if (not result) or (not is_valid):