From a14ce85357419f41f0994625d29d3f1af7a53d4c Mon Sep 17 00:00:00 2001
From: Petr Viktorin <pviktori@redhat.com>
Date: Tue, 18 Nov 2014 10:40:31 +0100
Subject: Do not restore SELinux settings that were not backed up

https://fedorahosted.org/freeipa/ticket/4678

Reviewed-By: Petr Vobornik <pvoborni@redhat.com>
---
 ipaplatform/redhat/tasks.py | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'ipaplatform/redhat')

diff --git a/ipaplatform/redhat/tasks.py b/ipaplatform/redhat/tasks.py
index cb0a27f73..b26604aa7 100644
--- a/ipaplatform/redhat/tasks.py
+++ b/ipaplatform/redhat/tasks.py
@@ -363,6 +363,8 @@ class RedHatTaskNamespace(BaseTaskNamespace):
         updated_vars = {}
         failed_vars = {}
         for setting, state in required_settings.iteritems():
+            if state is None:
+                continue
             try:
                 (stdout, stderr, rc) = ipautil.run([paths.GETSEBOOL, setting])
                 original_state = stdout.split()[2]
-- 
cgit