Merge ~kissiel/plainbox-provider-resource:fix-1731660-bad-driver-reported into plainbox-provider-resource:master

[Maciej Kisielewski]

override the driver name to amdgpu-pro only for vendor == amd

previously, if the system had vulkan-amdgpu-pro pkg installed, the script
reported 'amdgpu-pro' as the driver for all the GPUs.

Now it's amdgpu-pro is reported only for GPUs from vendor 4098 - AMD.
This is still not perfect, as theretically there might be multiple amd pus
in the system, not all of them amdgpu-pro, but it still makes it closer to the truth and right for the typical intel+radeon configuration.

This patch also rearranges the logic for the dpkg-query call.
if not `some commands run` intuitively should mean "if the command failed"
which in the case of subprocess.call(...) is casted to boolean, therefore
`if not subprocess.call(...)` means success. I added explicit comparison to 0.

Fixes: LP:1731660

[Sheila Miguez (codersquid)]

lgtm

review: Approve

diff --git a/bin/graphics_card_resource b/bin/graphics_card_resource
index 6c18672..19daf11 100755
--- a/bin/graphics_card_resource
+++ b/bin/graphics_card_resource
@@ -2,8 +2,9 @@
 #
 # This file is part of Checkbox.
 #
-# Copyright 2015 Canonical Ltd.
+# Copyright 2015-2017 Canonical Ltd.
 #    Authors: Daniel Manrique <[e-mail]>
+#    Authors: Maciej Kisielewski <[e-mail]>
 #
 # Checkbox is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License version 3,
@@ -124,10 +125,14 @@ def main():
     try:
         for index, record in enumerate(video_devices, 1):
             record['index'] = index
-            if not subprocess.call(['dpkg-query', '-W', 'vulkan-amdgpu-pro'],
-                                   stderr=subprocess.STDOUT,
-                                   stdout=subprocess.DEVNULL):
-                record['driver'] = 'amdgpu-pro'
+            if record['vendor_id'] == '4098':  # vendor == amd/ati
+                if subprocess.call(
+                        ['dpkg-query', '-W', 'vulkan-amdgpu-pro'],
+                        stderr=subprocess.STDOUT,
+                        stdout=subprocess.DEVNULL) == 0:
+                    # dpkg-query did not report error, so
+                    # vulkan-amdgpu-pro is installed
+                    record['driver'] = 'amdgpu-pro'
             if 'product' not in record:
                 # Fake a product name with the product_id
                 try: