Merge pull request #808 from sfromm/issue800

Make exception more specific (OSError) in setup module for selinux call
This commit is contained in:
Michael DeHaan 2012-08-08 16:11:04 -07:00
commit 4da1dc3dbd

2
setup
View file

@ -126,7 +126,7 @@ class Facts(object):
self.facts['selinux']['status'] = 'enabled' self.facts['selinux']['status'] = 'enabled'
try: try:
self.facts['selinux']['policyvers'] = selinux.security_policyvers() self.facts['selinux']['policyvers'] = selinux.security_policyvers()
except: except OSError, e:
self.facts['selinux']['policyvers'] = 'unknown' self.facts['selinux']['policyvers'] = 'unknown'
try: try:
(rc, configmode) = selinux.selinux_getenforcemode() (rc, configmode) = selinux.selinux_getenforcemode()