Skip to content

Commit 935923b

Browse files
DellEMC: Z9332f - Fix error message during Chassis initialization (sonic-net#9218)
1 parent b8eb9f2 commit 935923b

File tree

1 file changed

+8
-6
lines changed
  • platform/broadcom/sonic-platform-modules-dell/z9332f/sonic_platform

1 file changed

+8
-6
lines changed

platform/broadcom/sonic-platform-modules-dell/z9332f/sonic_platform/component.py

+8-6
Original file line numberDiff line numberDiff line change
@@ -50,9 +50,10 @@ def get_cpld2_version():
5050
def get_ssd_version():
5151
val = 'NA'
5252
try:
53-
ssd_ver = subprocess.check_output(['ssdutil','-v'], text=True)
54-
except Exception:
55-
return val
53+
ssd_ver = subprocess.check_output(['ssdutil', '-v'],
54+
stderr=subprocess.STDOUT, text=True)
55+
except (FileNotFoundError, subprocess.CalledProcessError):
56+
pass
5657
else:
5758
version = re.search(r'Firmware\s*:(.*)',ssd_ver)
5859
if version:
@@ -63,9 +64,10 @@ def get_ssd_version():
6364
def get_pciephy_version():
6465
val = 'NA'
6566
try:
66-
pcie_ver = subprocess.check_output('bcmcmd "pciephy fw version"', shell=True, text=True)
67-
except Exception:
68-
return val
67+
pcie_ver = subprocess.check_output(['bcmcmd', 'pciephy fw version'],
68+
stderr=subprocess.STDOUT, text=True)
69+
except (FileNotFoundError, subprocess.CalledProcessError):
70+
pass
6971
else:
7072
version = re.search(r'PCIe FW loader version:\s(.*)', pcie_ver)
7173
if version:

0 commit comments

Comments
 (0)