mirror of
https://github.com/saltstack/salt.git
synced 2025-04-17 10:10:20 +00:00
Fix pylint whitespace errors
This commit is contained in:
parent
e5371ac720
commit
cbe98d97a3
1 changed files with 3 additions and 5 deletions
|
@ -944,7 +944,6 @@ def upgrade(refresh=True, dist_upgrade=False, **kwargs):
|
|||
force_conf = '--force-confnew'
|
||||
else:
|
||||
force_conf = '--force-confold'
|
||||
|
||||
cmd = []
|
||||
if salt.utils.systemd.has_scope(__context__) \
|
||||
and __salt__['config.get']('systemd.scope', True):
|
||||
|
@ -952,14 +951,13 @@ def upgrade(refresh=True, dist_upgrade=False, **kwargs):
|
|||
|
||||
cmd.extend(['apt-get', '-q', '-y',
|
||||
'-o', 'DPkg::Options::={0}'.format(force_conf),
|
||||
'-o', 'DPkg::Options::=--force-confdef'])
|
||||
|
||||
'-o', 'DPkg::Options::=--force-confdef']
|
||||
|
||||
if kwargs.get('force_yes', False):
|
||||
cmd.append('--force-yes')
|
||||
|
||||
if kwargs.get('skip_verify', False):
|
||||
cmd.append('--allow-unauthenticated')
|
||||
|
||||
|
||||
cmd.append('dist-upgrade' if dist_upgrade else 'upgrade')
|
||||
|
||||
call = __salt__['cmd.run_all'](cmd,
|
||||
|
|
Loading…
Add table
Reference in a new issue