diff --git a/pki-core-seobject-pylint.patch b/pki-core-seobject-pylint.patch new file mode 100644 index 0000000..7f3fce1 --- /dev/null +++ b/pki-core-seobject-pylint.patch @@ -0,0 +1,79 @@ +From c3b69ae92c884e7f230766b37a8723c2ce905eca Mon Sep 17 00:00:00 2001 +From: Matthew Harmsen +Date: Mon, 27 Nov 2017 22:42:00 -0700 +Subject: [PATCH] Fix seobject pylint issues + +dogtagpki Pagure Issue #2856 - Pylint flags seobject failures + +Change-Id: Ied117961e8212ac0a73e78b9857282de91aa7cf7 +--- + base/server/python/pki/server/deployment/pkihelper.py | 5 ++++- + .../python/pki/server/deployment/scriptlets/selinux_setup.py | 8 ++++---- + 2 files changed, 8 insertions(+), 5 deletions(-) + +diff --git a/base/server/python/pki/server/deployment/pkihelper.py b/base/server/python/pki/server/deployment/pkihelper.py +index c6e1597d7..49945b954 100644 +--- a/base/server/python/pki/server/deployment/pkihelper.py ++++ b/base/server/python/pki/server/deployment/pkihelper.py +@@ -801,7 +801,9 @@ class ConfigurationFile: + extra=config.PKI_INDENTATION_LEVEL_2) + return + +- portrecs = seobject.portRecords().get_all() ++ trans = seobject.semanageRecords("targeted") ++ trans.start() ++ portrecs = seobject.portRecords(trans).get_all() + portlist = ports[:] + for port in portlist: + context = "" +@@ -829,6 +831,7 @@ class ConfigurationFile: + raise Exception( + log.PKIHELPER_INVALID_SELINUX_CONTEXT_FOR_PORT % + (port, context)) ++ trans.finish() + return + + def verify_ds_secure_connection_data(self): +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 9c926d18f..d5e4b0cf3 100644 +--- a/base/server/python/pki/server/deployment/scriptlets/selinux_setup.py ++++ b/base/server/python/pki/server/deployment/scriptlets/selinux_setup.py +@@ -83,7 +83,7 @@ class PkiScriptlet(pkiscriptlet.AbstractBasePkiScriptlet): + if deployer.mdict['pki_instance_name'] != \ + config.PKI_DEPLOYMENT_DEFAULT_TOMCAT_INSTANCE_NAME: + +- fcon = seobject.fcontextRecords() ++ fcon = seobject.fcontextRecords(trans) + + config.pki_log.info( + "adding selinux fcontext \"%s\"", +@@ -121,7 +121,7 @@ class PkiScriptlet(pkiscriptlet.AbstractBasePkiScriptlet): + deployer.mdict['pki_database_path'] + self.suffix, + config.PKI_CERTDB_SELINUX_CONTEXT, "", "s0", "") + +- port_records = seobject.portRecords() ++ port_records = seobject.portRecords(trans) + for port in ports: + config.pki_log.info( + "adding selinux port %s", port, +@@ -176,7 +176,7 @@ class PkiScriptlet(pkiscriptlet.AbstractBasePkiScriptlet): + if deployer.mdict['pki_instance_name'] != \ + config.PKI_DEPLOYMENT_DEFAULT_TOMCAT_INSTANCE_NAME: + +- fcon = seobject.fcontextRecords() ++ fcon = seobject.fcontextRecords(trans) + + config.pki_log.info( + "deleting selinux fcontext \"%s\"", +@@ -212,7 +212,7 @@ class PkiScriptlet(pkiscriptlet.AbstractBasePkiScriptlet): + deployer.mdict['pki_database_path'] + + self.suffix, "") + +- port_records = seobject.portRecords() ++ port_records = seobject.portRecords(trans) + for port in ports: + config.pki_log.info( + "deleting selinux port %s", port, +-- +2.13.6 + diff --git a/pki-core.spec b/pki-core.spec index 285cb46..073cd81 100644 --- a/pki-core.spec +++ b/pki-core.spec @@ -208,6 +208,8 @@ Source0: http://pki.fedoraproject.org/pki/sources/%{name}/%{version}/%{ Source0: http://pki.fedoraproject.org/pki/sources/%{name}/%{version}/%{release}/%{name}-%{version}%{?prerel}.tar.gz %endif +Patch0: pki-core-seobject-pylint.patch + # Obtain version phase number (e. g. - used by "alpha", "beta", etc.) # # NOTE: For "alpha" releases, will be ".a1", ".a2", etc. @@ -803,6 +805,7 @@ This package is a part of the PKI Core used by the Certificate System. %prep %setup -q -n %{name}-%{version}%{?prerel} +%patch0 -p1 %clean %{__rm} -rf %{buildroot}