meskal/philote
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Update parameter name to work with Ansible 2.6

Browse source
This commit is contained in:
Piotr Śliwka 2018-08-31 22:02:35 +02:00 • committed by Simon Schuster
parent 2a3aec90d6
commit 97f3196430
2 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/copy.lua
View file

@ -24,7 +24,7 @@ end
function main(arg) function main(arg)
local module = Ansible.new( local module = Ansible.new(
{ src = { required=true } { src = { required=true }
, original_basename = { required=false } , _original_basename = { required=false }
, content = { required=false } , content = { required=false }
, path = { aliases={'dest'}, required=true } , path = { aliases={'dest'}, required=true }
, backup = { default=false, type='bool' } , backup = { default=false, type='bool' }
@ -69,7 +69,7 @@ function main(arg)
local dest = File.expanduser(p['path']) local dest = File.expanduser(p['path'])
local backup = p['backup'] local backup = p['backup']
local force = p['force'] local force = p['force']
local original_basename = p['original_basename'] local _original_basename = p['_original_basename']
local validate = p['validate'] local validate = p['validate']
local follow = p['follow'] local follow = p['follow']
local mode = p['mode'] local mode = p['mode']
@ -92,7 +92,7 @@ function main(arg)
local changed = false local changed = false
-- Special handling for recursive copy - create intermediate dirs -- Special handling for recursive copy - create intermediate dirs
if original_basename and string.match(dest, "/$") then if _original_basename and string.match(dest, "/$") then
dest = File.join(dest, orignal_basename) dest = File.join(dest, orignal_basename)
local dirname = File.dirname(dest) local dirname = File.dirname(dest)
if not File.exists(dirname) and File.isabs(dirname) then if not File.exists(dirname) and File.isabs(dirname) then
@ -113,8 +113,8 @@ function main(arg)
end end
if File.isdir(dest) then if File.isdir(dest) then
local basename = File.basename(src) local basename = File.basename(src)
if original_basename then if _original_basename then
basename = original_basename basename = _original_basename
end end
dest = File.join(dest, basename) dest = File.join(dest, basename)
end end

8
src/file.lua
View file

@ -112,7 +112,7 @@ function main(arg)
local module = Ansible.new( local module = Ansible.new(
{ state = { choices={'file', 'directory', 'link', 'hard', 'touch', 'absent' } } { state = { choices={'file', 'directory', 'link', 'hard', 'touch', 'absent' } }
, path = { aliases={'dest', 'name'}, required=true } , path = { aliases={'dest', 'name'}, required=true }
, original_basename = { required=false } , _original_basename = { required=false }
, recurse = { default=false, type='bool' } , recurse = { default=false, type='bool' }
, force = { required=false, default=false, type='bool' } , force = { required=false, default=false, type='bool' }
, diff_peek = {} , diff_peek = {}
@ -204,11 +204,11 @@ function main(arg)
end end
end end
-- original_basename is used by other modules that depend on file -- _original_basename is used by other modules that depend on file
if File.isdir(path) and ("link" ~= state and "absent" ~= state) then if File.isdir(path) and ("link" ~= state and "absent" ~= state) then
local basename = nil local basename = nil
if params['original_basename'] then if params['_original_basename'] then
basename = params['original_basename'] basename = params['_original_basename']
elseif src ~= nil then elseif src ~= nil then
basename = File.basename(src) basename = File.basename(src)
end end