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

Variable names standardization

Browse source 
- Changes `self.softwareUpdates` and `softwareUpdates` to `self.skipSoftwareUpdates` and `skipSoftwareUpdates`.
- Changes `self.driverUpdates` and `driverUpdates` to `self.skipDriverUpdates` and `skipDriverUpdates`.
- Changes default values.

Consistent with salt.module.win_update.py

See https://github.com/saltstack/salt/issues/30081 for more information.
This commit is contained in:
Michele Preziuso 2016-01-29 09:17:06 +00:00
parent f5917ac1e8
commit 4f2d4af2e7
1 changed files with 11 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
salt/states/win_update.py
View file

@ -107,9 +107,9 @@ def _gather_update_categories(updateCollection):
class PyWinUpdater(object):
def __init__(self, categories=None, skipUI=True, skipDownloaded=True,
skipInstalled=True, skipReboot=False, skipPresent=True,
softwareUpdates=True, driverUpdates=False, skipHidden=True):
def __init__(self, categories=None, skipUI=True, skipDownloaded=False,
skipInstalled=True, skipReboot=False, skipPresent=False,
skipSoftwareUpdates=False, skipDriverUpdates=False, skipHidden=True):
log.debug('CoInitializing the pycom system')
pythoncom.CoInitialize()
@ -120,8 +120,8 @@ class PyWinUpdater(object):
self.skipPresent = skipPresent
self.skipHidden = skipHidden
self.softwareUpdates = softwareUpdates
self.driverUpdates = driverUpdates
self.skipSoftwareUpdates = skipSoftwareUpdates
self.skipDriverUpdates = skipDriverUpdates
self.categories = categories
self.foundCategories = None
@ -208,11 +208,11 @@ class PyWinUpdater(object):
else:
search_string += '{0} and '.format(searchParams[1])
if self.softwareUpdates and self.driverUpdates:
if not self.skipSoftwareUpdates and not self.skipDriverUpdates:
search_string += 'Type=\'Software\' or Type=\'Driver\''
elif self.softwareUpdates:
elif not self.skipSoftwareUpdates:
search_string += 'Type=\'Software\''
elif self.driverUpdates:
elif not self.skipDriverUpdates:
search_string += 'Type=\'Driver\''
else:
return False
@ -313,12 +313,12 @@ class PyWinUpdater(object):
elif include == 'present':
self.skipPresent = state
elif include == 'software':
self.softwareUpdates = state
self.skipSoftwareUpdates = state
elif include == 'driver':
self.driverUpdates = state
self.skipDriverUpdates = state
log.debug('new search state: \n\tUI: {0}\n\tDownload: {1}\n\tInstalled: {2}\n\treboot :{3}\n\tPresent: {4}\n\tsoftware: {5}\n\tdriver: {6}'.format(
self.skipUI, self.skipDownloaded, self.skipInstalled, self.skipReboot,
self.skipPresent, self.softwareUpdates, self.driverUpdates))
self.skipPresent, self.skipSoftwareUpdates, self.skipDriverUpdates))
def _search(win_updater, retries=5):