From 9cb0c08d75e5df1cd72923895cf4977f653c3983 Mon Sep 17 00:00:00 2001
From: Will Thames <will@thames.id.au>
Date: Wed, 10 Jan 2018 10:07:06 +1000
Subject: [PATCH] Ensure alternatives are displayed in deprecation warnings
Use plural `alternatives` key to display deprecation alternatives.
---
lib/ansible/cli/__init__.py | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/lib/ansible/cli/__init__.py b/lib/ansible/cli/__init__.py
index 3daf65085be..1c14bcdbca7 100644
--- a/lib/ansible/cli/__init__.py
+++ b/lib/ansible/cli/__init__.py
@@ -173,8 +173,8 @@ class CLI(with_metaclass(ABCMeta, object)):
for deprecated in C.config.DEPRECATED:
name = deprecated[0]
why = deprecated[1]['why']
- if 'alternative' in deprecated[1]:
- alt = ', use %s instead' % deprecated[1]['alternative']
+ if 'alternatives' in deprecated[1]:
+ alt = ', use %s instead' % deprecated[1]['alternatives']
else:
alt = ''
ver = deprecated[1]['version']