Fixup slurp module usage when not running as root, fix error handling path in slurp module.

This commit is contained in:
Michael DeHaan 2012-04-19 11:38:44 -04:00
parent 70734f5968
commit 13ba31231e
2 changed files with 2 additions and 2 deletions

View file

@ -471,7 +471,7 @@ class Runner(object):
if self.remote_user == 'root':
metadata = '/etc/ansible/setup'
else:
metadata = '~/.ansible/setup'
metadata = "/home/%s/.ansible/setup" % self.remote_user
# install the template module
slurp_module = self._transfer_module(conn, tmp, 'slurp')

View file

@ -50,7 +50,7 @@ source = params['src']
if not os.path.exists(source):
print json.dumps(dict(
failed = 1,
msg = "file not found: %s" % metadata
msg = "file not found: %s" % source
))
sys.exit(1)