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

Merge pull request #35954 from morganwillcock/upgrade-on-batteries

Browse source 
win_pkg: Allow minion upgrade on batteries and report launch failure
This commit is contained in:
Mike Place 2016-09-08 10:25:37 +09:00 • committed by GitHub
commit c4ddfe3887
1 changed files with 14 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
salt/modules/win_pkg.py
View file

@ -707,9 +707,14 @@ def install(name=None, refresh=False, pkgs=None, saltenv='base', **kwargs):
start_in=cache_path,
trigger_type='Once',
start_date='1975-01-01',
start_time='01:00')
start_time='01:00',
ac_only=False,
stop_if_on_batteries=False)
# Run Scheduled Task
__salt__['task.run_wait'](name='update-salt-software')
if not __salt__['task.run_wait'](name='update-salt-software'):
log.error('Failed to install {0}'.format(pkg_name))
log.error('Scheduled Task failed to run')
ret[pkg_name] = {'install status': 'failed'}
else:
# Build the install command
cmd = []
@ -966,9 +971,14 @@ def remove(name=None, pkgs=None, version=None, **kwargs):
start_in=cache_path,
trigger_type='Once',
start_date='1975-01-01',
start_time='01:00')
start_time='01:00',
ac_only=False,
stop_if_on_batteries=False)
# Run Scheduled Task
__salt__['task.run_wait'](name='update-salt-software')
if not __salt__['task.run_wait'](name='update-salt-software'):
log.error('Failed to remove {0}'.format(target))
log.error('Scheduled Task failed to run')
ret[target] = {'uninstall status': 'failed'}
else:
# Build the install command
cmd = []