a-c-m
/
community.general
mirror of https://github.com/ansible-collections/community.general.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1830 from willthames/fix_tilde_path_in_file 

Fix behaviour when file handles a path with tilde
pull/4420/head
Michael DeHaan 2013-01-07 05:03:09 -08:00
parent 4d48daff80 4e50478a05
commit 3f4847a3ab
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
lib/ansible/module_common.py
View File

@ -254,8 +254,11 @@ class AnsibleModule(object):
return context return context
try: try:
ret = selinux.lgetfilecon(path) ret = selinux.lgetfilecon(path)
except: except OSError, e:
self.fail_json(path=path, msg='failed to retrieve selinux context') if e.errno == errno.ENOENT:
self.fail_json(path=path, msg='path %s does not exist' % path)
else:
self.fail_json(path=path, msg='failed to retrieve selinux context')
if ret[0] == -1: if ret[0] == -1:
return context return context
context = ret[1].split(':') context = ret[1].split(':')

2
library/file
View File

@ -139,7 +139,7 @@ def main():
params = module.params params = module.params
state = params['state'] state = params['state']
path = os.path.expanduser(params['path']) params['path'] = path = os.path.expanduser(params['path'])
# source is both the source of a symlink or an informational passing of the src for a template module # source is both the source of a symlink or an informational passing of the src for a template module
# or copy module, even if this module never uses it, it is needed to key off some things # or copy module, even if this module never uses it, it is needed to key off some things