From 8f231ec46947d7682ee84137e4b63930b296cac2 Mon Sep 17 00:00:00 2001 From: Abhijit Menon-Sen Date: Fri, 14 Aug 2015 10:55:13 +0530 Subject: [PATCH] Tweak deprecation warning, and apply it to --limit also --- lib/ansible/inventory/__init__.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/lib/ansible/inventory/__init__.py b/lib/ansible/inventory/__init__.py index 5e6e20c8a1..dd9fb92db3 100644 --- a/lib/ansible/inventory/__init__.py +++ b/lib/ansible/inventory/__init__.py @@ -191,7 +191,7 @@ class Inventory(object): pattern = ':'.join(pattern) if ';' in pattern or ',' in pattern: - display.deprecated("The use of ',' or ';' in host patterns has been removed", version=2.0, removed=True) + display.deprecated("Use ':' instead of ',' or ';' to separate host patterns", version=2.0, removed=True) patterns = self._split_pattern(pattern) hosts = self._evaluate_patterns(patterns) @@ -533,6 +533,9 @@ class Inventory(object): if subset_pattern is None: self._subset = None else: + if ';' in subset_pattern or ',' in subset_pattern: + display.deprecated("Use ':' instead of ',' or ';' to separate host patterns", version=2.0, removed=True) + subset_patterns = self._split_pattern(subset_pattern) results = [] # allow Unix style @filename data