valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-08 01:18:58 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Minor fix on clean

Browse Source 
`re.match` matches from the start of the line, while we are actually looking for anywhere in the key ('system-serial' won't match on `match`, but will on `search`)
This commit is contained in:
Ronald van Zantvoort 2015-04-17 13:23:31 +02:00
parent 2210bd175e
commit e07c4803a6
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
salt/modules/smbios.py
View File

@ -296,7 +296,7 @@ def _dmi_isclean(key, val):
continue continue
log.trace('DMI {0} value {1} is an invalid UUID'.format(key, val.replace('\n', ' '))) log.trace('DMI {0} value {1} is an invalid UUID'.format(key, val.replace('\n', ' ')))
return False return False
elif re.match('serial|part|version', key): elif re.search('serial|part|version', key):
# 'To be filled by O.E.M. # 'To be filled by O.E.M.
# 'Not specified' etc. # 'Not specified' etc.
# 0000000, 1234667 etc. # 0000000, 1234667 etc.
@ -304,7 +304,7 @@ def _dmi_isclean(key, val):
return not re.match(r'^[0]+$', val) \ return not re.match(r'^[0]+$', val) \
and not re.match(r'[0]?1234567[8]?[9]?[0]?', val) \ and not re.match(r'[0]?1234567[8]?[9]?[0]?', val) \
and not re.search(r'sernum|part[_-]?number|specified|filled', val, flags=re.IGNORECASE) and not re.search(r'sernum|part[_-]?number|specified|filled', val, flags=re.IGNORECASE)
elif 'asset' in key or 'manufacturer' in key: elif re.search('asset|manufacturer', key):
# AssetTag0. Manufacturer04. Begone. # AssetTag0. Manufacturer04. Begone.
return not re.search(r'manufacturer|to be filled|available|asset|^no(ne|t)', val, flags=re.IGNORECASE) return not re.search(r'manufacturer|to be filled|available|asset|^no(ne|t)', val, flags=re.IGNORECASE)
else: else: