From 3e3c923ab9424f55cea31275f9f8fd81c737ff76 Mon Sep 17 00:00:00 2001 From: William Wernert Date: Mon, 22 Feb 2021 15:44:29 -0500 Subject: [PATCH] Arrange missing pillar error message better --- salt/common/tools/sbin/so-rule | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/salt/common/tools/sbin/so-rule b/salt/common/tools/sbin/so-rule index 46efca568..d365d0856 100644 --- a/salt/common/tools/sbin/so-rule +++ b/salt/common/tools/sbin/so-rule @@ -66,12 +66,11 @@ def find_minion_pillar() -> str: result.append(os.path.join(root, f_minion_id)) if len(result) == 0: - print_err('Could not find manager-type pillar (eval, standalone, manager, import.)') - print_err('Are you running this script on the manager?') + print_err('Could not find manager-type pillar (eval, standalone, manager, import). Are you running this script on the manager?') sys.exit(3) elif len(result) > 1: res_str = ', '.join(f'\"{result}\"') - print_err('(This should not happen, the system is in an error state if you see this message.)') + print_err('(This should not happen, the system is in an error state if you see this message.)\n') print_err('More than one manager-type pillar exists, minion id\'s listed below:') print_err(f' {res_str}') sys.exit(3)