From 9063ab330b55bbbe7f2e0ff294f9b52035bf43c1 Mon Sep 17 00:00:00 2001
From: Alexander Haase <alex@alexanderhaase.net>
Date: Sat, 17 Jan 2015 23:23:23 -0500
Subject: [PATCH] Debugged & moderately tested match_on functionality for
 modules/mount and states/mount with relation to fstab.

---
 salt/modules/mount.py | 28 ++++++++++++++++++++--------
 salt/states/mount.py  |  3 ++-
 2 files changed, 22 insertions(+), 9 deletions(-)

diff --git a/salt/modules/mount.py b/salt/modules/mount.py
index ab9f49bddf..84878b63b4 100644
--- a/salt/modules/mount.py
+++ b/salt/modules/mount.py
@@ -187,6 +187,8 @@ class _fstab_entry():
 	Utility class for manipulating fstab entries. Primarily we're parsing,
 	formating, and comparing lines. Parsing emits dicts expected from
 	fstab() or raises a ValueError.
+
+	Note: We'll probably want to use os.normpath and os.normcase on 'name'
 	'''
 
 	class ParseError( ValueError ):
@@ -234,11 +236,18 @@ class _fstab_entry():
 
 	def __init__( self, **criteria ):
 		'''Store non-empty, non-null values to use as filter'''
-		self.criteria = dict( filter( lambda (key,value): value ), criteria.items )
+		items = filter( lambda (key, value): value is not None, criteria.items() )
+		items = map( lambda (key, value): (key, str( value ) ), items )
+		self.criteria = dict( items )
+
+	@staticmethod
+	def norm_path( path ):
+		'''Resolve equivalent paths equivalently'''
+		return os.path.normcase( os.path.normpath( path ) )
 
 	def match( self, line ):
 		'''compare potentially partial criteria against line'''
-		entry = self.line_to_dict( line )
+		entry = self.dict_from_line( line )
 		for key, value in self.criteria.items():
 			if entry[ key ] != value:
 				return False
@@ -261,7 +270,7 @@ def fstab(config='/etc/fstab'):
     with salt.utils.fopen(config) as ifile:
         for line in ifile:
 	    try:
-                entry = _fstab_entry.line_to_dict( line, _fstab_entry.compatibility_keys )
+                entry = _fstab_entry.dict_from_line( line, _fstab_entry.compatibility_keys )
                 ret[ entry.pop( 'name' ) ] = entry
             except _fstab_entry.ParseError:
                 pass
@@ -281,9 +290,6 @@ def rm_fstab(name, device, config='/etc/fstab' ):
     '''
     modified = False
 
-    if isinstance( opts, list ):
-        opts = ','.join( opts )
-
     criteria = _fstab_entry( 
 	name = name, 
 	device = device )
@@ -312,6 +318,9 @@ def rm_fstab(name, device, config='/etc/fstab' ):
         except (IOError, OSError) as exc:
             msg = "Couldn't write to {0}: {1}"
             raise CommandExecutionError(msg.format(config, str(exc)))
+
+    # Note: not clear why we always return 'True'
+    # --just copying previous behavior at this point...
     return True
 
 
@@ -368,7 +377,7 @@ def set_fstab(
         criteria = entry.pick( match_on )
 
     except KeyError:
-        invalid_keys = filter( lambda key: key in _fstab_entry.fstab_keys, match_on )
+        invalid_keys = filter( lambda key: key not in _fstab_entry.fstab_keys, match_on )
         raise CommandExecutionError( 'Unrecognized keys in match_on: "{0}"'.format( invalid_keys ) )
 
     # parse file, use ret to cache status
@@ -384,9 +393,12 @@ def set_fstab(
                         ret = 'present'
                         if entry.match( line ):
                             lines.append( line )
-                        else
+                        else:
                             ret = 'change'
                             lines.append( str( entry ) )
+                    else:
+                       lines.append( line )
+
                 except _fstab_entry.ParseError:
                     lines.append( line )                        
 
diff --git a/salt/states/mount.py b/salt/states/mount.py
index 2aef4b2bf4..f5aa4653ae 100644
--- a/salt/states/mount.py
+++ b/salt/states/mount.py
@@ -90,8 +90,9 @@ def mounted(name,
     user
         The user to own the mount; this defaults to the user salt is
         running as on the minion
+
     match_on
-        A name or list of fstab properties on which this state shoudl be applied. 
+        A name or list of fstab properties on which this state should be applied. 
         Default is ``auto``, a special value indicating to guess based on fstype.
         In general, ``auto`` matches on name for recognized special devices and
         device otherwise.