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

Move check for rtag to outermost-nesting in function

Browse source
This commit is contained in:
Michael Walton 2016-07-19 09:52:24 -04:00
parent ac67c6b493
commit 340110b4b4
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
salt/states/pkg.py
View file

@ -1228,10 +1228,7 @@ def installed(
reinstall=reinstall,
normalize=normalize,
**kwargs)
refreshed = refreshed or refresh
if os.path.isfile(rtag) and refreshed:
os.remove(rtag)
except CommandExecutionError as exc:
ret = {'name': name,
'changes': {},
@ -1287,6 +1284,9 @@ def installed(
failed_hold = [hold_ret[x] for x in hold_ret
if not hold_ret[x]['result']]
if os.path.isfile(rtag) and refreshed:
os.remove(rtag)
if to_unpurge:
changes['purge_desired'] = __salt__['lowpkg.unpurge'](*to_unpurge)