Merge ~pieq/bugit/+git/qabro:fix-1910193-no-pci-bus into bugit:master

[Pierre Equoy]

As explained in lp:1910193, if the device does not have a PCI bus, calling lspci will fail and qabro will fail to launch.

This commit fixes that by checking the returncode from the lspci command.

I tested it on a regular amd64 PC with a proper PCI bus by building a test snap and it works (so it means no regression so far), but I haven't been able to test it on a no-PCI bus device...

[Patrick Liu (patliu)]

+1 LGTM

review: Approve

diff --git a/qabro/bug_assistant.py b/qabro/bug_assistant.py
index 7af347c..16bc5d1 100644
--- a/qabro/bug_assistant.py
+++ b/qabro/bug_assistant.py
@@ -1,12 +1,11 @@
 import getpass
-from glob import glob
 import os
 import re
 import subprocess
 import sys
 import tarfile
 from collections import Counter
-
+from glob import glob
 from launchpadlib.launchpad import Launchpad
 from launchpadlib.uris import LPNET_WEB_ROOT, STAGING_WEB_ROOT, QASTAGING_WEB_ROOT
 
@@ -368,7 +367,7 @@ class AttachmentAssistant:
         if os.path.isfile(udc):
             with open(udc) as f:
                 dcd = f.read()
-            manifest = re.search("^([^\s#]+)$", dcd, re.MULTILINE)[0]
+            manifest = re.search(r"^([^\s#]+)$", dcd, re.MULTILINE)[0]
         if manifest:
             standard_info["Manifest"] = manifest
 
@@ -389,12 +388,18 @@ class AttachmentAssistant:
 
         standard_info['CPU'] = AttachmentAssistant.get_cpu_info()
 
-        lspci_output = (subprocess.check_output(['lspci', '-nn'])
-                        .decode(sys.stdout.encoding)
-                        .splitlines())
-        # '03' is the PCI class for display controllers
-        standard_info['GPU'] = '\n'.join([line for line in lspci_output
-                                          if '[03' in line])
+        command = ["lspci", "-nn"]
+        process = subprocess.run(command,
+                                 stdout=subprocess.PIPE,
+                                 stderr=subprocess.PIPE)
+        if process.returncode == 0:
+            lspci_output = process.stdout.decode(sys.stdout.encoding).splitlines()
+            # '03' is the PCI class for display controllers
+            standard_info['GPU'] = '\n'.join([line for line in lspci_output
+                                              if '[03' in line])
+        else:
+            print("Error while running lspci:")
+            print(process.stderr)
 
         standard_info["kernel-version"] = (subprocess.check_output(["uname", "-r"])
                                            .decode(sys.stdout.encoding)
@@ -406,7 +411,7 @@ class AttachmentAssistant:
         """Parse /proc/cpuinfo and return cpu model information."""
         cpus = []
         cpuinfo = {}
-        parse_line = re.compile(r'(.*?)\s+:\s+(.*)').match
+        parse_line = re.compile(r"(.*?)\s+:\s+(.*)").match
         processor_line = re.compile(r'^(p|P)rocessor')
         with open('/proc/cpuinfo') as file:
             for line in file:
diff --git a/qabro/utils.py b/qabro/utils.py
index 89845b3..8c3e4e8 100644
--- a/qabro/utils.py
+++ b/qabro/utils.py
@@ -1,7 +1,9 @@
 #!/usr/bin/env python3
-import socket, json, pprint
-
 import gi
+import json
+import pprint
+import socket
+
 gi.require_version('Snapd', '1')
 from gi.repository import Snapd