[icinga-checkins] icinga.org: icinga2/master: Update i2tcl to match latest language changes

git at icinga.org git at icinga.org
Wed Aug 10 08:29:06 CEST 2016


Module: icinga2
Branch: master
Commit: 9c6e2cdff9394a8e65c1e13fbfc241921583a7d0
URL:    https://git.icinga.org/?p=icinga2.git;a=commit;h=9c6e2cdff9394a8e65c1e13fbfc241921583a7d0

Author: Gunnar Beutner <gunnar.beutner at netways.de>
Date:   Wed Aug 10 08:28:42 2016 +0200

Update i2tcl to match latest language changes

refs #12338

---

 contrib/i2eval/i2tcl.cpp |    2 +-
 contrib/i2eval/i2tcl.tcl |    3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/contrib/i2eval/i2tcl.cpp b/contrib/i2eval/i2tcl.cpp
index cdc712a..2455045 100644
--- a/contrib/i2eval/i2tcl.cpp
+++ b/contrib/i2eval/i2tcl.cpp
@@ -39,7 +39,7 @@ static Value i2_call_tcl(const String& command, const String& mtype, const std::
 	delete [] objv;
 
 	if (code == TCL_ERROR)
-		BOOST_THROW_EXCEPTION(std::runtime_error("An error occured in the TCL script"));
+		BOOST_THROW_EXCEPTION(std::runtime_error("An error occurred in the TCL script"));
 
 	Value vresult;
 
diff --git a/contrib/i2eval/i2tcl.tcl b/contrib/i2eval/i2tcl.tcl
index 9706330..4b653de 100644
--- a/contrib/i2eval/i2tcl.tcl
+++ b/contrib/i2eval/i2tcl.tcl
@@ -32,8 +32,7 @@ i2_register_command chanhost getchanhost string
 i2_register_command chanbans chanbans list
 i2_register_command getnick i2_getnick string
 i2_register_command getchan i2_getchan string
-i2_register_command __commit i2_null null
-i2_register_command commit_objects i2_null null
+i2_register_command "Internal.run_with_activation_context" i2_null null
 i2_register_command exit i2_null null
 
 proc i2_null {} {



More information about the icinga-checkins mailing list