wbrawner/ansible
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Don't try to expand path for None values

Browse source
This commit is contained in:
Michael DeHaan 2012-04-20 08:02:12 -04:00
parent 445e48b991
commit 7794493952
2 changed files with 12 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
library/copy
View file

@ -40,9 +40,12 @@ for x in items:
(k, v) = x.split("=")
params[k] = v
src = os.path.expanduser(params['src'])
dest = os.path.expanduser(params['dest'])
src = params['src']
dest = params['dest']
if src:
src = os.path.expanduser(src)
if dest:
dest = os.path.expanduser(dest)
# raise an error if there is no src file
if not os.path.exists(src):

8
library/file
View file

@ -88,8 +88,12 @@ for x in items:
params[k] = v
state = params.get('state','file')
path = os.path.expanduser(params.get('path', params.get('dest', params.get('name', None))))
src = os.path.expanduser(params.get('src', None))
path = params.get('path', params.get('dest', params.get('name', None)))
if path:
path = os.path.expanduser(path)
src = params.get('src', None)
if src:
path = os.path.expanduser(src)
dest = params.get('dest', None)
mode = params.get('mode', None)
owner = params.get('owner', None)