2 files changed, 21 insertions, 4 deletions
diff --git a/base/server/python/pki/server/deployment/pkihelper.py b/base/server/python/pki/server/deployment/pkihelper.py
index efe85c85d..821739bc5 100644
--- a/base/server/python/pki/server/deployment/pkihelper.py
+++ b/base/server/python/pki/server/deployment/pkihelper.py
@@ -43,8 +43,16 @@ import xml.etree.ElementTree as ET
 from lxml import etree
 import zipfile
 import selinux
+
+seobject = None
 if selinux.is_selinux_enabled():
-    import seobject
+    try:
+        import seobject
+    except ImportError:
+        # TODO: Fedora 22 has an incomplete Python 3 package
+        # sepolgen is missing.
+        if sys.version_info.major == 2:
+            raise
 
 
 # PKI Deployment Imports
@@ -856,7 +864,7 @@ class ConfigurationFile:
         if len(ports) == 0:
             return
 
-        if not bool(selinux.is_selinux_enabled()):
+        if not selinux.is_selinux_enabled() or seobject is None:
             config.pki_log.error(
                 log.PKIHELPER_SELINUX_DISABLED,
                 extra=config.PKI_INDENTATION_LEVEL_2)
diff --git a/base/server/python/pki/server/deployment/scriptlets/selinux_setup.py b/base/server/python/pki/server/deployment/scriptlets/selinux_setup.py
index 0fa3e6c11..97fe5b32c 100644
--- a/base/server/python/pki/server/deployment/scriptlets/selinux_setup.py
+++ b/base/server/python/pki/server/deployment/scriptlets/selinux_setup.py
@@ -21,9 +21,18 @@
 
 from __future__ import absolute_import
 import selinux
+import sys
 import time
+
+seobject = None
 if selinux.is_selinux_enabled():
-    import seobject
+    try:
+        import seobject
+    except ImportError:
+        # TODO: Fedora 22 has an incomplete Python 3 package
+        # sepolgen is missing.
+        if sys.version_info.major == 2:
+            raise
 
 # PKI Deployment Imports
 from .. import pkiconfig as config
@@ -50,7 +59,7 @@ class PkiScriptlet(pkiscriptlet.AbstractBasePkiScriptlet):
                                 extra=config.PKI_INDENTATION_LEVEL_1)
             return self.rv
 
-        if not bool(selinux.is_selinux_enabled()):
+        if not selinux.is_selinux_enabled() or seobject is None:
             config.pki_log.info(log.SELINUX_DISABLED_SPAWN_1, __name__,
                                 extra=config.PKI_INDENTATION_LEVEL_1)
             return self.rv