saltstack/salt
1
0
Fork 0
mirror of https://github.com/saltstack/salt.git synced 2025-04-17 10:10:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Remove nonsense comment and react on generally absent path name

Browse source
This commit is contained in:
Bo Maryniuk 2016-11-24 18:27:53 +01:00
parent 47d21d9ed2
commit e6958f7f15
1 changed files with 3 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
salt/states/archive.py
View file

@ -545,10 +545,9 @@ def extracted(name,
ret['comment'] = '{0} is not an absolute path'.format(name)
return ret
else:
if name is None:
# Only way this happens is if some doofus specifies "- name: None"
# in their SLS file. Prevent tracebacks by failing gracefully.
ret['comment'] = 'None is not a valid directory path'
if not name:
# Empty name, like None, '' etc.
ret['comment'] = 'Name of the directory path needs to be specified'
return ret
# os.path.isfile() returns False when there is a trailing slash, hence
# our need for first stripping the slash and then adding it back later.