Module: check_mk Branch: master Commit: 0bfd56189d7a9cd1cfbd76fea15f4a3e65fcd09b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=0bfd56189d7a9c… Author: Andreas Boesl &lt;ab(a)mathias-kettner.de&gt; Date: Tue Aug 26 16:29:50 2014 +0200 #1100 FIX WATO backup domains: fixed bug were excluded files still got deleted on snapshot restore It is possible to configure a backup domain so that certain files are not packed into the snapshot.<br> As a result, upon restore these file should not get deleted..<br> This mechanism did not work correctly. --- .werks/1100 | 11 +++++++++++ ChangeLog | 3 ++- web/htdocs/multitar.py | 4 ++-- 3 files changed, 15 insertions(+), 3 deletions(-) diff --git a/.werks/1100 b/.werks/1100 new file mode 100644 index 0000000..4a5a3c9 --- /dev/null +++ b/.werks/1100 @@ -0,0 +1,11 @@ +Title: WATO backup domains: fixed bug were excluded files still got deleted on snapshot restore +Level: 2 +Component: wato +Compatible: compat +Version: 1.2.5i6 +Date: 1409062516 +Class: fix + +It is possible to configure a backup domain so that certain files are not packed into the snapshot.<br> +As a result, upon restore these file should not get deleted..<br> +This mechanism did not work correctly. diff --git a/ChangeLog b/ChangeLog index 35e04df..861fd75 100644 --- a/ChangeLog +++ b/ChangeLog @@ -59,9 +59,9 @@ * 1145 FIX: windows_tasks: handle case correctly where task is currently running... * 1378 FIX: mk_logwatch: remove exceeding \n when rewriting message and using \0... * 1147 FIX: upc_capacity, ups_socomec_capacity: Fix checking of battery left levels... + * 1099 FIX: tsm_scratch: now returns the variable name instead the values during inventory... * 0650 FIX: f5_bigip_pool: limits to the number of active nodes are now correctly applied... NOTE: Please refer to the migration notes! - * 1099 FIX: tsm_scratch: now returns the variable name instead the values during inventory... Multisite: * 1066 Implemented Dashboard Designer... @@ -80,6 +80,7 @@ * 0191 FIX: Added swp files to the ignore list for the WATO git feature... * 1153 FIX: Changed custom user attributes can now be used immediately... * 0201 FIX: Fixed error message in Rulelist of RBN... + * 1100 FIX: WATO backup domains: fixed bug were excluded files still got deleted on snapshot restore... Notifications: * 1156 FIX: Graphs in HTML mails are now sent again where they where missing... diff --git a/web/htdocs/multitar.py b/web/htdocs/multitar.py index 4189097..d42d143 100644 --- a/web/htdocs/multitar.py +++ b/web/htdocs/multitar.py @@ -185,9 +185,9 @@ def extract_domains(tar, domains): for pattern in domain.get("exclude", []): if "*" in pattern: import glob - exclude_files.extend(glob.glob("%s/%s/%s" % (domain["prefix"], path, pattern))) + exclude_files.extend(glob.glob("%s/%s" % (domain["prefix"], pattern))) else: - exclude_files.append("%s/%s/%s" % (domain["prefix"], path, pattern)) + exclude_files.append("%s/%s" % (domain["prefix"], pattern)) cleanup_dir(full_path, exclude_files) else: os.remove(full_path)