[checkmk-commits] Check_MK Git: check_mk: FIX: deletion of automation accounts now works

Module: check_mk Branch: master Commit: 043ac6d1c6ade678387cb4e3fb910134c69377aa URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=043ac6d1c6ade6… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Mar 9 16:07:35 2012 +0100 FIX: deletion of automation accounts now works --- ChangeLog | 4 ++++ web/htdocs/wato.py | 8 ++++++++ 2 files changed, 12 insertions(+), 0 deletions(-) diff --git a/ChangeLog b/ChangeLog index 286df4f..e892377 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +1.2.0b2: + WATO: + * FIX: deletion of automation accounts now works + 1.2.0b1: Core, Setup, etc.: * new tool 'livedump' for dumping configuration and status diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 23d4290..86629a5 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -7234,6 +7234,14 @@ def save_users(profiles): elif os.path.exists(auth_file): os.remove(auth_file) + # Remove settings directories of non-existant users + dir = defaults.var_dir + "/web" + for e in os.listdir(dir): + if e not in ['.', '..'] and e not in profiles: + entry = dir + "/" + e + if os.path.isdir(entry): + shutil.rmtree(entry) + # Call the users_saved hook call_hook_users_saved(users)