Title: [opsview-base] [338] Removed unnecessary patch
- Revision
- 338
- Author
- tvoon
- Date
- 2013-08-12 21:17:00 +0100 (Mon, 12 Aug 2013)
Log Message
Removed unnecessary patch
Modified Paths
Removed Paths
Modified: trunk/Makefile
===================================================================
--- trunk/Makefile 2013-08-12 11:28:57 UTC (rev 337)
+++ trunk/Makefile 2013-08-12 20:17:00 UTC (rev 338)
@@ -830,7 +830,6 @@
tar --gzip -xf ${NDOUTILS}.tar.gz
# cd ${NDOUTILS} && patch -p1 < ../patches/ndoutils_issue_commands.patch # Not needed — for Nagios 2 only
cd ${NDOUTILS} && patch -p1 < ../patches/ndoutils_notification_level.patch
- cd ${NDOUTILS} && patch -p1 < ../patches/ndoutils_extra_tables_at_configdumpend.patch
# cd ${NDOUTILS} && patch -p1 < ../patches/ndoutils_better_mysql_detection.1.4b7.patch
cd ${NDOUTILS} && patch -p1 < ../patches/ndoutils_check_timeperiod_command.patch
# cd ${NDOUTILS} && patch -p1 < ../patches/ndoutils_trim_externalcommands_table.patch
===================================================================
--- trunk/patches/ndoutils_extra_tables_at_configdumpend.patch 2013-08-12 11:28:57 UTC (rev 337)
+++ trunk/patches/ndoutils_extra_tables_at_configdumpend.patch 2013-08-12 20:17:00 UTC (rev 338)
@@ -1,23 +0,0 @@
-diff -Bbur ndoutils-2-0.orig/src/dbhandlers.c ndoutils-2-0/src/dbhandlers.c
---- ndoutils-2-0.orig/src/dbhandlers.c 2012-09-27 13:00:58.000000000 +0000
-+++ ndoutils-2-0/src/dbhandlers.c 2012-11-21 16:42:15.000000000 +0000
-@@ -3200,6 +3200,20 @@
-
- int ndo2db_handle_configdumpend(ndo2db_idi *idi){
-
-+ /* Opsview patch here. Need to create some convenience tables after all configuration has been dumped */
-+ /* Done via external command */
-+ time_t current_time=0L;
-+ char *command;
-+
-+ /* configdumpend is called twice - once for original data, once for retained data. We only do below on the second pass */
-+ /* With config_output_options=2, configdumpend is only called once now */
-+ if (idi->current_object_config_type == 1) {
-+ /* Ignore return code - will be checking as part of external program */
-+ time(¤t_time);
-+ asprintf(&command, "touch /usr/local/nagios/var/ndoconfigend/%lu", current_time);
-+ system(command); free(command);
-+ }
-+
- return NDO_OK;
- }
_______________________________________________
Opsview-checkins mailing list
Opsview-checkins@lists.opsview.org
http://lists.opsview.org/lists/listinfo/opsview-checkins
