Commit 13ba3123 by Michael DeHaan

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

parent 70734f59
...@@ -471,7 +471,7 @@ class Runner(object): ...@@ -471,7 +471,7 @@ class Runner(object):
if self.remote_user == 'root': if self.remote_user == 'root':
metadata = '/etc/ansible/setup' metadata = '/etc/ansible/setup'
else: else:
metadata = '~/.ansible/setup' metadata = "/home/%s/.ansible/setup" % self.remote_user
# install the template module # install the template module
slurp_module = self._transfer_module(conn, tmp, 'slurp') slurp_module = self._transfer_module(conn, tmp, 'slurp')
......
...@@ -50,7 +50,7 @@ source = params['src'] ...@@ -50,7 +50,7 @@ source = params['src']
if not os.path.exists(source): if not os.path.exists(source):
print json.dumps(dict( print json.dumps(dict(
failed = 1, failed = 1,
msg = "file not found: %s" % metadata msg = "file not found: %s" % source
)) ))
sys.exit(1) sys.exit(1)
......
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