Commit d2e457f8 by Aaron Brady

Accept numeric user and group parameters

parent 1f969251
...@@ -369,9 +369,12 @@ class AnsibleModule(object): ...@@ -369,9 +369,12 @@ class AnsibleModule(object):
user, group = self.user_and_group(path) user, group = self.user_and_group(path)
if owner != user: if owner != user:
try: try:
uid = pwd.getpwnam(owner).pw_uid uid = int(owner)
except KeyError: except ValueError:
self.fail_json(path=path, msg='chown failed: failed to look up user %s' % owner) try:
uid = pwd.getpwnam(owner).pw_uid
except KeyError:
self.fail_json(path=path, msg='chown failed: failed to look up user %s' % owner)
if self.check_mode: if self.check_mode:
return True return True
try: try:
...@@ -390,9 +393,12 @@ class AnsibleModule(object): ...@@ -390,9 +393,12 @@ class AnsibleModule(object):
if self.check_mode: if self.check_mode:
return True return True
try: try:
gid = grp.getgrnam(group).gr_gid gid = int(group)
except KeyError: except ValueError:
self.fail_json(path=path, msg='chgrp failed: failed to look up group %s' % group) try:
gid = grp.getgrnam(group).gr_gid
except KeyError:
self.fail_json(path=path, msg='chgrp failed: failed to look up group %s' % group)
try: try:
os.chown(path, -1, gid) os.chown(path, -1, gid)
except OSError: except OSError:
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment