From 2bd8cb57906b6da5854a803c520025f27cc1b431 Mon Sep 17 00:00:00 2001
From: Michael DeHaan <michael@ansibleworks.com>
Date: Sat, 19 Oct 2013 14:14:16 -0400
Subject: [PATCH] Make the deprecation detector in templates more accurate. 
 Fixes #4514.

---
 lib/ansible/utils/template.py | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/lib/ansible/utils/template.py b/lib/ansible/utils/template.py
index 9d6b4ef4c76..fb777a46366 100644
--- a/lib/ansible/utils/template.py
+++ b/lib/ansible/utils/template.py
@@ -303,7 +303,9 @@ def legacy_varReplace(basedir, raw, vars, lookup_fatal=True, depth=0, expand_lis
 
     result = ''.join(done)
 
-    if result != orig:
+    previous_old_style_vars = orig.count('$')
+    new_old_style_vars = result.count('$')
+    if previous_old_style_vars != new_old_style_vars:
         from ansible import utils
         utils.deprecated("Legacy variable substitution, such as using ${foo} or $foo instead of {{ foo }} is currently valid but will be phased out and has been out of favor since version 1.2. This is the last of legacy features on our deprecation list. You may continue to use this if you have specific needs for now","1.5")
     return result