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

Removed unnecessary logic

Browse source
This commit is contained in:
twangboy 2015-11-02 12:15:10 -07:00
parent 89ebd268e6
commit f187db3288
1 changed files with 2 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
salt/states/file.py
View file

@ -929,15 +929,8 @@ def symlink(
return _error(ret, ((
'File exists where the backup target {0} should go'
).format(backupname)))
elif os.path.isfile(backupname)\
or __salt__['file.is_link'](backupname)\
or os.path.isdir(backupname):
__salt__['file.remove'](backupname)
else:
return _error(ret, ((
'Something exists where the backup target {0}'
'should go'
).format(backupname)))
__salt__['file.remove'](backupname)
os.rename(name, backupname)
elif force:
# Remove whatever is in the way
@ -1781,17 +1774,8 @@ def directory(name,
return _error(ret, ((
'File exists where the backup target {0} should go'
).format(backupname)))
elif os.path.isfile(backupname) \
or __salt__['file.is_link'](backupname) \
or os.path.isdir(backupname):
__salt__['file.remove'](backupname)
else:
return _error(ret, ((
'Something exists where the backup target {0}'
'should go'
).format(backupname)))
__salt__['file.remove'](backupname)
os.rename(name, backupname)
elif force:
# Remove whatever is in the way