From 1ae2fdf1c6bb14fc3db34cba00271916a1d7c527 Mon Sep 17 00:00:00 2001 From: Vratko Polak Date: Thu, 5 Dec 2019 17:07:24 +0100 Subject: Improve quoting of asterisks When quoted, the asterisks are understood as literal characters. When unquoted, so they act as globs patterns. When used to match files already present in the filesystem, the asterisks should be unquoted. When used to match a package name (not a file), the asterisks should be quoted to prevent the bash expansion, as programs such as apt-get and yum do their own expasion afterwards. Unquoted asterisks for matching package names may happen to work when there are no files to match the bash expansion, but quoted asterisks are sure to avoid accidents. Also, we want an asterisk both before and after "vpp", due to package names such as libvppinfra-dev and python3-vpp-api. Change-Id: I657a24c24a71d865915aba201bd0d3276cb33281 Signed-off-by: Vratko Polak --- resources/libraries/python/DUTSetup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'resources/libraries/python/DUTSetup.py') diff --git a/resources/libraries/python/DUTSetup.py b/resources/libraries/python/DUTSetup.py index 1cca974893..3544997e55 100644 --- a/resources/libraries/python/DUTSetup.py +++ b/resources/libraries/python/DUTSetup.py @@ -661,7 +661,7 @@ class DUTSetup: node, f"rpm -ivh {vpp_pkg_dir}*.rpm", timeout=120, sudo=True, message=message ) - exec_cmd_no_error(node, u"rpm -qai *vpp*", sudo=True) + exec_cmd_no_error(node, u"rpm -qai '*vpp*'", sudo=True) DUTSetup.restart_service(node, Constants.VPP_UNIT) @staticmethod -- cgit 1.2.3-korg