diff options
Diffstat (limited to 'ipaserver/install/installutils.py')
| -rw-r--r-- | ipaserver/install/installutils.py | 25 |
1 files changed, 14 insertions, 11 deletions
diff --git a/ipaserver/install/installutils.py b/ipaserver/install/installutils.py index cc53f75c..c6376d82 100644 --- a/ipaserver/install/installutils.py +++ b/ipaserver/install/installutils.py @@ -786,15 +786,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 @@ -827,6 +828,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) |