[checkmk-commits] Check_MK Git: check_mk: File uploads (backup&restore, sync snapshots) no longer broken

Module: check_mk Branch: master Commit: 67fa428b3d6f3473e651670a71f7b26614326b17 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=67fa428b3d6f34… Author: Andreas Boesl &lt;ab(a)mathias-kettner.de&gt; Date: Wed Dec 11 16:56:39 2013 +0100 File uploads (backup&restore, sync snapshots) no longer broken --- web/htdocs/wato.py | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 851a414..d74d5df 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -5548,12 +5548,12 @@ def mode_snapshot(phase): return None, _("Created snapshot <tt>%s</tt>.") % filename # upload snapshot - elif html.has_var("_upload_file"): - if html.var("_upload_file") == "": + elif html.uploads.get("_upload_file"): + uploaded_file = html.uploads.get("_upload_file") + if uploaded_file[0] == "": raise MKUserError(None, _("Please select a file for upload.")) - return None if html.check_transaction(): - multitar.extract_from_buffer(html.var("_upload_file"), backup_paths) + multitar.extract_from_buffer(uploaded_file[2], backup_paths) log_pending(SYNCRESTART, None, "snapshot-restored", _("Restored from uploaded file")) return None, _("Successfully restored configuration.") @@ -8438,9 +8438,10 @@ def automation_push_snapshot(): message += ", ".join([e[-1] for e in pending[:10]]) raise MKGeneralException(message) - tarcontent = html.var('snapshot') + tarcontent = html.uploads.get("snapshot") if not tarcontent: raise MKGeneralException(_('Invalid call: The snapshot is missing.')) + tarcontent = tarcontent[2] multitar.extract_from_buffer(tarcontent, replication_paths)