read/write binary w/msgpack files

Conflicts: salt/utils/minions.py
saltstack · Feb 13, 2014 · fd1b71a · fd1b71a
1 parent f151853
commit fd1b71a
Showing 1 changed file with 5 additions and 5 deletions.
diff --git a/salt/utils/minions.py b/salt/utils/minions.py
@@ -111,7 +111,7 @@ def _check_grain_minions(self, expr):
                 if not os.path.isfile(datap):
                     continue
                 grains = self.serial.load(
-                    salt.utils.fopen(datap)
+                    salt.utils.fopen(datap, 'rb')
                 ).get('grains')
                 if not salt.utils.subdict_match(grains, expr):
                     minions.remove(id_)
@@ -135,7 +135,7 @@ def _check_grain_pcre_minions(self, expr):
                 if not os.path.isfile(datap):
                     continue
                 grains = self.serial.load(
-                    salt.utils.fopen(datap)
+                    salt.utils.fopen(datap, 'rb')
                 ).get('grains')
                 if not salt.utils.subdict_match(grains, expr,
                                                 delim=':', regex_match=True):
@@ -160,7 +160,7 @@ def _check_pillar_minions(self, expr):
                 if not os.path.isfile(datap):
                     continue
                 pillar = self.serial.load(
-                    salt.utils.fopen(datap)
+                    salt.utils.fopen(datap, 'rb')
                 ).get('pillar')
                 if not salt.utils.subdict_match(pillar, expr):
                     minions.remove(id_)
@@ -184,7 +184,7 @@ def _check_ipcidr_minions(self, expr):
                 if not os.path.isfile(datap):
                     continue
                 grains = self.serial.load(
-                    salt.utils.fopen(datap)
+                    salt.utils.fopen(datap, 'rb')
                 ).get('grains')
 
                 num_parts = len(expr.split('/'))
@@ -233,7 +233,7 @@ def _check_range_minions(self, expr):
                 if not os.path.isfile(datap):
                     continue
                 grains = self.serial.load(
-                    salt.utils.fopen(datap)
+                    salt.utils.fopen(datap, 'rb')
                 ).get('grains')
 
                 range_ = seco.range.Range(self.opts['range_server'])