mirror of
https://github.com/freeipa/ansible-freeipa.git
synced 2026-07-25 00:44:42 +00:00
Do not use "del os.environ" as the variable might not exist
The use of del os.environ assumes that the environment variable exists. If the variable does not exist, this call will result in a traceback. The solution is to use os.environ.pop(VARIABLE, None) instead. This is the ansible-freeipa fix for https://pagure.io/freeipa/issue/9446 (Nightly test failure for replica installation with --setup-ca)
This commit is contained in:
@@ -132,7 +132,7 @@ def main():
|
||||
else:
|
||||
get_ca_certs(fstore, options, servers[0], basedn, realm)
|
||||
changed = True
|
||||
del os.environ['KRB5_CONFIG']
|
||||
os.environ.pop('KRB5_CONFIG', None)
|
||||
except errors.FileError as e:
|
||||
module.fail_json(msg='%s' % e)
|
||||
except Exception as e:
|
||||
|
||||
@@ -123,7 +123,7 @@ def temp_kdestroy(ccache_dir, ccache_name):
|
||||
"""Destroy temporary ticket and remove temporary ccache."""
|
||||
if ccache_name is not None:
|
||||
run([paths.KDESTROY, '-c', ccache_name], raiseonerr=False)
|
||||
del os.environ['KRB5CCNAME']
|
||||
os.environ.pop('KRB5CCNAME', None)
|
||||
if ccache_dir is not None:
|
||||
shutil.rmtree(ccache_dir, ignore_errors=True)
|
||||
|
||||
|
||||
@@ -272,7 +272,7 @@ def main():
|
||||
get_ca_cert(fstore, options, servers[0], basedn)
|
||||
else:
|
||||
get_ca_certs(fstore, options, servers[0], basedn, realm)
|
||||
del os.environ['KRB5_CONFIG']
|
||||
os.environ.pop('KRB5_CONFIG', None)
|
||||
except errors.FileError as e:
|
||||
module.fail_json(msg='%s' % e)
|
||||
except Exception as e:
|
||||
|
||||
Reference in New Issue
Block a user