saltstack/salt
1
0
Fork 0
mirror of https://github.com/saltstack/salt.git synced 2025-04-17 10:10:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

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

Browse source
This commit is contained in:
Thomas S Hatch 2012-06-15 23:24:25 -06:00
commit 0952be6f24
1 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
salt/utils/find.py
View file

@ -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 @@ class OwnerOption(Option):
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))