cast before and after in sed stuff, Fix #1095

saltstack · Apr 23, 2012 · 8589ff8 · 8589ff8 · laroche · Apr 23, 2012
1 parent 1e403ea
commit 8589ff8
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 0 deletions.
diff --git a/salt/modules/file.py b/salt/modules/file.py
@@ -396,6 +396,10 @@ def sed(path, before, after, limit='', backup='.bak', options='-r -e',
     '''
     # Largely inspired by Fabric's contrib.files.sed()
     # XXX:dc: Do we really want to always force escaping?
+    #
+    # Mandate that before and after are strings
+    before = str(before)
+    after = str(after)
     before = _sed_esc(before, escape_all)
     after = _sed_esc(after, escape_all)
 

diff --git a/salt/states/file.py b/salt/states/file.py
@@ -1337,6 +1337,10 @@ def sed(name, before, after, limit='', backup='.bak', options='-r -e',
     # sed returns no output if the edit matches anything or not so we'll have
     # to look for ourselves
 
+    # Mandate that before and afetr are strings
+    before = str(before)
+    after = str(after)
+
     # Look for the pattern before attempting the edit
     if not __salt__['file.contains'](name, before, limit):
         # Pattern not found; try to guess why