From f3489a53cd259d15e5ab2d46931a0783b632d14a Mon Sep 17 00:00:00 2001 From: Michael DeHaan Date: Wed, 11 Apr 2012 20:57:41 -0400 Subject: [PATCH] English error messages if src and dest are left off the copy, template, or fetch modules --- lib/ansible/runner.py | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-) diff --git a/lib/ansible/runner.py b/lib/ansible/runner.py index 188a00c27e8..edd9763e552 100755 --- a/lib/ansible/runner.py +++ b/lib/ansible/runner.py @@ -458,8 +458,10 @@ class Runner(object): # load up options options = utils.parse_kv(self.module_args) - source = options['src'] - dest = options['dest'] + source = options.get('src', None) + dest = options.get('dest', None) + if source is None or dest is None: + return (host, True, dict(failed=True, msg="src and dest are required"), '') # transfer the file to a remote tmp location tmp_src = tmp + source.split('/')[-1] @@ -486,11 +488,14 @@ class Runner(object): # load up options options = utils.parse_kv(self.module_args) - source = options['src'] + source = options.get('src', None) + dest = options.get('dest', None) + if source is None or dest is None: + return (host, True, dict(failed=True, msg="src and dest are required"), '') # files are saved in dest dir, with a subdir for each host, then the filename filename = os.path.basename(source) - dest = "%s/%s/%s" % (utils.path_dwim(self.basedir, options['dest']), host, filename) + dest = "%s/%s/%s" % (utils.path_dwim(self.basedir, dest), host, filename) # compare old and new md5 for support of change hooks local_md5 = None @@ -536,9 +541,11 @@ class Runner(object): # load up options options = utils.parse_kv(self.module_args) - source = options['src'] - dest = options['dest'] + source = options.get('src', None) + dest = options.get('dest', None) metadata = options.get('metadata', None) + if source is None or dest is None: + return (host, True, dict(failed=True, msg="src and dest are required"), '') if metadata is None: if self.remote_user == 'root':