Revert "Revert "oran-shell-release: release image for F""
[pti/rtp.git] / meta-starlingx / meta-stx-flock / stx-config / files / 0002-cgts-client-handle-exceptions-other-than-CalledProcessErr.patch
1 From 7ed620de2987bebfb41fe5506c1296e8d03560d5 Mon Sep 17 00:00:00 2001
2 From: Jackie Huang <jackie.huang@windriver.com>
3 Date: Tue, 28 Apr 2020 17:24:01 +0800
4 Subject: [PATCH] pci.py: handle exceptions other than CalledProcessError
5
6 Signed-off-by: Jackie Huang <jackie.huang@windriver.com>
7 ---
8  sysinv/sysinv/sysinv/sysinv/agent/pci.py | 6 ++++++
9  1 file changed, 6 insertions(+)
10
11 diff --git a/sysinv/sysinv/sysinv/sysinv/agent/pci.py b/sysinv/sysinv/sysinv/sysinv/agent/pci.py
12 index 5d3a2fd..14fb0c5 100644
13 --- a/sysinv/sysinv/sysinv/sysinv/agent/pci.py
14 +++ b/sysinv/sysinv/sysinv/sysinv/agent/pci.py
15 @@ -539,6 +539,12 @@ class PCIOperator(object):
16                          LOG.info("Could not determine DPDK support for "
17                                   "NIC (vendor %s device: %s), defaulting "
18                                   "to False", vendor, device)
19 +                except Exception as e:
20 +                    dpdksupport = False
21 +                    LOG.debug("An exception of type %s occurred:\n%s" % (type(e), e))
22 +                    LOG.info("Could not determine DPDK support for "
23 +                             "NIC (vendor %s device: %s), defaulting "
24 +                             "to False", vendor, device)
25  
26                  # determine the net directory for this device
27                  dirpcinet = self.get_pci_net_directory(a)
28 -- 
29 2.7.4
30