From 7870ac5e27209b2319cb46d2ca1598162bb9d24e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20P=C3=A9ters?= Date: Wed, 9 Sep 2020 08:43:15 +0200 Subject: [PATCH] eoptasks: allow specifying multiple suffixes to be stripped --- eoptasks/eoptasks.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/eoptasks/eoptasks.py b/eoptasks/eoptasks.py index b204514..1daa700 100755 --- a/eoptasks/eoptasks.py +++ b/eoptasks/eoptasks.py @@ -85,12 +85,13 @@ def get_servers(): sys.exit(1) ignorelist = [x.strip() for x in config.get('config', 'ignore', fallback='').split(',')] - stripsuffix = config.get('config', 'stripsuffix', fallback='') + stripsuffixes = [x.strip() for x in config.get('config', 'stripsuffix', fallback='').split(',')] servergroups = yaml.safe_load(open(servergroup))['servergroups'] def get_display_name(x): - if stripsuffix and x.endswith(stripsuffix): - return x[:-len(stripsuffix)] + for stripsuffix in stripsuffixes: + if stripsuffix and x.endswith(stripsuffix): + return x[:-len(stripsuffix)] return x for group in servergroups: