[dpdk-stable] patch 'usertools: check for lspci dependency' has been queued to stable release 18.08.1

[Kevin Traynor <ktraynor@redhat.com>]

Hi,

FYI, your patch has been queued to stable release 18.08.1

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 12/08/18. So please
shout if anyone has objections.

Also note that after the patch there's a diff of the upstream commit vs the patch applied
to the branch. If the code is different (ie: not only metadata diffs), due for example to
a change in context or macro names, please double check it.

Thanks.

Kevin Traynor

---
>From 82ee91691f432c044863ec61057bdca8a503bee8 Mon Sep 17 00:00:00 2001
From: Anatoly Burakov <anatoly.burakov@intel.com>
Date: Tue, 13 Nov 2018 16:06:26 +0000
Subject: [PATCH] usertools: check for lspci dependency

[ upstream commit 1a5a9cb32a93da47fa6aa0da8407337feaf901f8 ]

On some distributions (such as CentOS 7) lspci may not be installed
by default, causing exceptions which are difficult to interpret.

Fix devbind script to check if lspci is installed at script startup.

Signed-off-by: Anatoly Burakov <anatoly.burakov@intel.com>
Reviewed-by: Rami Rosen <roszenrami@gmail.com>
---
 usertools/dpdk-devbind.py | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/usertools/dpdk-devbind.py b/usertools/dpdk-devbind.py
index 7d564634c..40dc28a7d 100755
--- a/usertools/dpdk-devbind.py
+++ b/usertools/dpdk-devbind.py
@@ -656,4 +656,11 @@ def do_arg_actions():
 def main():
     '''program main function'''
+    # check if lspci is installed, suppress any output
+    with open(os.devnull, 'w') as devnull:
+        ret = subprocess.call(['which', 'lspci'],
+                              stdout=devnull, stderr=devnull)
+        if ret != 0:
+            print("'lspci' not found - please install 'pciutils'")
+            sys.exit(1)
     parse_args()
     check_modules()
-- 
2.19.0

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2018-11-29 13:11:36.625425651 +0000
+++ 0062-usertools-check-for-lspci-dependency.patch	2018-11-29 13:11:34.000000000 +0000
@@ -1,15 +1,15 @@
-From 1a5a9cb32a93da47fa6aa0da8407337feaf901f8 Mon Sep 17 00:00:00 2001
+From 82ee91691f432c044863ec61057bdca8a503bee8 Mon Sep 17 00:00:00 2001
 From: Anatoly Burakov <anatoly.burakov@intel.com>
 Date: Tue, 13 Nov 2018 16:06:26 +0000
 Subject: [PATCH] usertools: check for lspci dependency
 
+[ upstream commit 1a5a9cb32a93da47fa6aa0da8407337feaf901f8 ]
+
 On some distributions (such as CentOS 7) lspci may not be installed
 by default, causing exceptions which are difficult to interpret.
 
 Fix devbind script to check if lspci is installed at script startup.
 
-Cc: stable@dpdk.org
-
 Signed-off-by: Anatoly Burakov <anatoly.burakov@intel.com>
 Reviewed-by: Rami Rosen <roszenrami@gmail.com>
 ---