Merge branch 'develop' of github.com:saltstack/salt into develop

thatch45 · thatch45 · commit 0952be6f2483 · 2012-06-15T23:24:25.000-06:00
diff --git a/salt/utils/find.py b/salt/utils/find.py
@@ -162,10 +162,11 @@ def _parse_size(value):
         style = '='
 
     if len(scalar) > 0:
-        multiplier = {'k': 2 ** 10,
+        multiplier = {'b': 2 ** 0,
+                      'k': 2 ** 10,
                       'm': 2 ** 20,
                       'g': 2 ** 30,
-                      't': 2 ** 40}.get(scalar[-1])
+                      't': 2 ** 40}.get(scalar[-1].lower())
         if multiplier:
             scalar = scalar[:-1].strip()
         else:
@@ -308,7 +309,7 @@ def __init__(self, key, value):
                 self.uids.add(int(name))
             else:
                 try:
-                    self.uid = pwd.getpwnam(value).pw_uid
+                    self.uids.add(pwd.getpwnam(value).pw_uid)
                 except KeyError:
                     raise ValueError('no such user "{0}"'.format(name))
 
