Merge pull request #664 from jpmens/a1

Fix file module to support = in args; remove superflous call in get_url
reviewable/pr18780/r1
Michael DeHaan 13 years ago
commit 8ea6e84efb

@ -135,7 +135,7 @@ if not len(items):
params = {} params = {}
for x in items: for x in items:
(k, v) = x.split("=") (k, v) = x.split("=",1)
params[k] = v params[k] = v
state = params.get('state','file') state = params.get('state','file')

@ -60,7 +60,7 @@ def url_do_get(module, url, dest):
if os.path.isdir(dest): if os.path.isdir(dest):
urlfilename = url_filename(url) urlfilename = url_filename(url)
actualdest = "%s/%s" % (dest, url_filename(url)) actualdest = "%s/%s" % (dest, urlfilename)
module.params['path'] = actualdest module.params['path'] = actualdest
else: else:
actualdest = dest actualdest = dest

Loading…
Cancel
Save