IntenseWebs/freeipa
3
0
Fork 0
mirror of https://salsa.debian.org/freeipa-team/freeipa.git synced 2025-02-25 18:55:28 -06:00
Code Issues Packages Projects Releases Wiki Activity

ipaserver/install/installutils: clean up properly after yield

Browse Source 
When a context to which we yield generates exception, the code in
private_ccache() and stopped_service() didn't get called for cleanup.
This commit is contained in:
Alexander Bokovoy 2014-01-15 17:26:10 +01:00 committed by Martin Kosek
parent 487a8f4749
commit cb411ff94e
1 changed files with 14 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
ipaserver/install/installutils.py
View File

@ -786,15 +786,16 @@ def private_ccache(path=None):
os.environ['KRB5CCNAME'] = path os.environ['KRB5CCNAME'] = path
yield try:
yield
finally:
if original_value is not None:
os.environ['KRB5CCNAME'] = original_value
else:
os.environ.pop('KRB5CCNAME')
if original_value is not None: if os.path.exists(path):
os.environ['KRB5CCNAME'] = original_value os.remove(path)
else:
os.environ.pop('KRB5CCNAME')
if os.path.exists(path):
os.remove(path)
@contextmanager @contextmanager
@ -827,6 +828,8 @@ def stopped_service(service, instance_name=""):
# Stop the service, do the required stuff and start it again # Stop the service, do the required stuff and start it again
root_logger.debug('Stopping %s%s.', service, log_instance_name) root_logger.debug('Stopping %s%s.', service, log_instance_name)
ipaservices.knownservices[service].stop(instance_name) ipaservices.knownservices[service].stop(instance_name)
yield try:
root_logger.debug('Starting %s%s.', service, log_instance_name) yield
ipaservices.knownservices[service].start(instance_name) finally:
root_logger.debug('Starting %s%s.', service, log_instance_name)
ipaservices.knownservices[service].start(instance_name)