Skip to content

Commit

Permalink
Merge pull request saltstack#16764 from thatch45/16762
Browse files Browse the repository at this point in the history
Don't allow args to be longs, msgpack does not like this and jids
  • Loading branch information
thatch45 committed Oct 20, 2014
2 parents abd7910 + 8ad8fa9 commit a1d27b9
Showing 1 changed file with 8 additions and 2 deletions.
10 changes: 8 additions & 2 deletions salt/utils/args.py
Original file line number Diff line number Diff line change
Expand Up @@ -17,12 +17,18 @@ def condition_input(args, kwargs):
'''
Return a single arg structure for the publisher to safely use
'''
ret = []
for arg in args:
if isinstance(arg, long):
ret.append(str(arg))
else:
ret.append(arg)
if isinstance(kwargs, dict) and kwargs:
kw_ = {'__kwarg__': True}
for key, val in kwargs.iteritems():
kw_[key] = val
return list(args) + [kw_]
return args
return ret + [kw_]
return ret


def parse_input(args, condition=True):
Expand Down

0 comments on commit a1d27b9

Please sign in to comment.