From f4739bc5217713cc208db292053a5f5665ea2284 Mon Sep 17 00:00:00 2001
From: Alexander Bokovoy <abokovoy@redhat.com>
Date: Jan 15 2014 16:44:15 +0000
Subject: ipaserver/install/installutils: clean up properly after yield


When a context to which we yield generates exception, the code in
private_ccache() and stopped_service() didn't get called for cleanup.

---

diff --git a/ipaserver/install/installutils.py b/ipaserver/install/installutils.py
index c26f072..3770432 100644
--- a/ipaserver/install/installutils.py
+++ b/ipaserver/install/installutils.py
@@ -784,15 +784,16 @@ def private_ccache(path=None):
 
     os.environ['KRB5CCNAME'] = path
 
-    yield
-
-    if original_value is not None:
-        os.environ['KRB5CCNAME'] = original_value
-    else:
-        os.environ.pop('KRB5CCNAME')
+    try:
+        yield
+    finally:
+        if original_value is not None:
+            os.environ['KRB5CCNAME'] = original_value
+        else:
+            os.environ.pop('KRB5CCNAME')
 
-    if os.path.exists(path):
-        os.remove(path)
+        if os.path.exists(path):
+            os.remove(path)
 
 
 @contextmanager
@@ -825,6 +826,8 @@ def stopped_service(service, instance_name=""):
         # Stop the service, do the required stuff and start it again
         root_logger.debug('Stopping %s%s.', service, log_instance_name)
         ipaservices.knownservices[service].stop(instance_name)
-        yield
-        root_logger.debug('Starting %s%s.', service, log_instance_name)
-        ipaservices.knownservices[service].start(instance_name)
+        try:
+            yield
+        finally:
+            root_logger.debug('Starting %s%s.', service, log_instance_name)
+            ipaservices.knownservices[service].start(instance_name)