From ef12e5f9a5799d5de07c2fccb030fc7e5c703e2c Mon Sep 17 00:00:00 2001 From: Dan Mick Date: Tue, 2 Dec 2014 19:07:01 -0800 Subject: [PATCH] misc.get_system_type(): fix distro=False version=True, add comments Fixes: #10237 Signed-off-by: Dan Mick --- teuthology/misc.py | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/teuthology/misc.py b/teuthology/misc.py index ae849da82c..52d850e1f0 100644 --- a/teuthology/misc.py +++ b/teuthology/misc.py @@ -1093,7 +1093,11 @@ def stop_daemons_of_type(ctx, type_): def get_system_type(remote, distro=False, version=False): """ - Return this system type (deb or rpm) or Distro. + If distro, return distro. + If version, return version (lsb_release -rs) + If both, return both. + If neither, return 'deb' or 'rpm' if distro is known to be one of those + Finally, if unknown, return the unfiltered distro (from lsb_release -is) """ r = remote.run( args=[ @@ -1110,13 +1114,13 @@ def get_system_type(remote, distro=False, version=False): return system_value.lower(), version if distro: return system_value.lower() + if version: + return version if system_value in ['Ubuntu', 'Debian']: return "deb" if system_value in ['CentOS', 'Fedora', 'RedHatEnterpriseServer', 'openSUSE project', 'SUSE LINUX']: return "rpm" - if version: - return version return system_value -- 2.39.5