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

Merge pull request #12585 from jond64/pkg.verify-ignore_types

Browse Source 
Added ignore_types option to pkg.verify ...
This commit is contained in:
Thomas S Hatch 2014-05-07 10:41:23 -06:00
commit ccbfcab777
2 changed files with 38 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
salt/modules/rpm.py
View File

@ -64,15 +64,21 @@ def list_pkgs(*packages):
return pkgs
def verify(*package):
def verify(*package, **kwargs):
'''
Runs an rpm -Va on a system, and returns the results in a dict
Files with an attribute of config, doc, ghost, license or readme in the
package header can be ignored using the ``ignore_types`` keyword argument
CLI Example:
.. code-block:: bash
salt '*' lowpkg.verify
salt '*' lowpkg.verify httpd
salt '*' lowpkg.verify 'httpd postfix'
salt '*' lowpkg.verify 'httpd postfix' ignore_types=['config','doc']
'''
ftypes = {'c': 'config',
'd': 'doc',
@ -80,6 +86,9 @@ def verify(*package):
'l': 'license',
'r': 'readme'}
ret = {}
ignore_types = {}
if 'ignore_types' in kwargs:
ignore_types = kwargs.get('ignore_types')
if package:
packages = ' '.join(package)
cmd = 'rpm -V {0}'.format(packages)
@ -95,25 +104,26 @@ def verify(*package):
fname = line[13:]
if line[11:12] in ftypes:
fdict['type'] = ftypes[line[11:12]]
if line[0:1] == 'S':
fdict['mismatch'].append('size')
if line[1:2] == 'M':
fdict['mismatch'].append('mode')
if line[2:3] == '5':
fdict['mismatch'].append('md5sum')
if line[3:4] == 'D':
fdict['mismatch'].append('device major/minor number')
if line[4:5] == 'L':
fdict['mismatch'].append('readlink path')
if line[5:6] == 'U':
fdict['mismatch'].append('user')
if line[6:7] == 'G':
fdict['mismatch'].append('group')
if line[7:8] == 'T':
fdict['mismatch'].append('mtime')
if line[8:9] == 'P':
fdict['mismatch'].append('capabilities')
ret[fname] = fdict
if not 'type' in fdict.keys() or not fdict['type'] in ignore_types:
if line[0:1] == 'S':
fdict['mismatch'].append('size')
if line[1:2] == 'M':
fdict['mismatch'].append('mode')
if line[2:3] == '5':
fdict['mismatch'].append('md5sum')
if line[3:4] == 'D':
fdict['mismatch'].append('device major/minor number')
if line[4:5] == 'L':
fdict['mismatch'].append('readlink path')
if line[5:6] == 'U':
fdict['mismatch'].append('user')
if line[6:7] == 'G':
fdict['mismatch'].append('group')
if line[7:8] == 'T':
fdict['mismatch'].append('mtime')
if line[8:9] == 'P':
fdict['mismatch'].append('capabilities')
ret[fname] = fdict
return ret

10
salt/modules/yumpkg.py
View File

@ -1073,19 +1073,25 @@ def get_locked_packages(pattern=None, full=False):
return current_locks
def verify(*names):
def verify(*names, **kwargs):
'''
.. versionadded:: 2014.1.0 (Hydrogen)
Runs an rpm -Va on a system, and returns the results in a dict
Files with an attribute of config, doc, ghost, license or readme in the
package header can be ignored using the ``ignore_types`` keyword argument
CLI Example:
.. code-block:: bash
salt '*' pkg.verify
salt '*' pkg.verify httpd
salt '*' pkg.verify 'httpd postfix'
salt '*' pkg.verify 'httpd postfix' ignore_types=['config','doc']
'''
return __salt__['lowpkg.verify'](*names)
return __salt__['lowpkg.verify'](*names, **kwargs)
def group_list():