Fix default groups lookup when the rpm package is not installed.

git-svn-id: svn+ssh://rpmlint.zarb.org/home/projects/rpmlint/svn/trunk@1688 9bc8b190-ac0f-0410-8968-dc7d1f502856
This commit is contained in:
Ville Skyttä 2009-11-25 17:24:33 +00:00
parent ca6039062c
commit 75a56c5d24
1 changed files with 11 additions and 7 deletions

18
Pkg.py
View File

@ -158,15 +158,19 @@ def safe_normpath(path):
ret = slashend_regex.sub('\\1', ret) ret = slashend_regex.sub('\\1', ret)
return ret return ret
def get_default_valid_rpmgroups(filename = ""): def get_default_valid_rpmgroups(filename = None):
""" Get the default rpm group from filename, or from the rpm package if no """Get default rpm groups from filename, or try to look them up from
filename is given""" the rpm package (if installed) if no filename is given"""
groups = [] groups = []
if not filename: if not filename:
p = InstalledPkg('rpm') try:
groupsfiles = [x for x in p.files() if x.endswith('/GROUPS')] p = InstalledPkg('rpm')
if groupsfiles: except KeyError:
filename = groupsfiles[0] pass
else:
groupsfiles = [x for x in p.files() if x.endswith('/GROUPS')]
if groupsfiles:
filename = groupsfiles[0]
if filename and os.path.exists(filename): if filename and os.path.exists(filename):
fobj = open(filename) fobj = open(filename)
try: try: