Title: [opsview-base] [159] Collapsed pk2 patch into pk
- Revision
- 159
- Author
- tvoon
- Date
- 2012-12-19 16:04:34 +0000 (Wed, 19 Dec 2012)
Log Message
Collapsed pk2 patch into pk
Modified Paths
Removed Paths
Modified: trunk/Makefile
===================================================================
--- trunk/Makefile 2012-12-19 15:47:09 UTC (rev 158)
+++ trunk/Makefile 2012-12-19 16:04:34 UTC (rev 159)
@@ -760,7 +760,6 @@
cd ${NDOUTILS} && patch -p1 < ../patches/ndoutils_database_long_output_removed.patch
cd ${NDOUTILS} && patch -p1 < ../patches/ndoutils_sync_nagios_4_object.h.patch
cd ${NDOUTILS} && patch -p1 < ../patches/ndoutils_pk.patch
- cd ${NDOUTILS} && patch -p1 < ../patches/ndoutils_pk2.patch
cd ${NDOUTILS} && patch -p1 < ../patches/ndoutils_no_unique_key_on_hostchecks.patch
# cd ${NDOUTILS} && patch -p1 < ../patches/ndoutils_downtimes_do_not_update_start_times.patch
# cd ${NDOUTILS} && patch -p1 < ../patches/ndoutils_hide_db_connection_messages.patch
Modified: trunk/patches/ndoutils_pk.patch
===================================================================
--- trunk/patches/ndoutils_pk.patch 2012-12-19 15:47:09 UTC (rev 158)
+++ trunk/patches/ndoutils_pk.patch 2012-12-19 16:04:34 UTC (rev 159)
@@ -307,7 +307,7 @@
+//printf("NDO_DATA_CURRENTNOTIFICATIONNUMBER %d\n",NDO_DATA_CURRENTNOTIFICATIONNUMBER);
+//printf("notdata->notification_number %d\n",notdata->notification_number);
+//printf("NDO_DATA_STATE %d\n",NDO_DATA_STATE);
-+//printf("notdata->state %s\n",notdata->state);
++//printf("notdata->state %d\n",notdata->state);
+//printf("NDO_DATA_OUTPUT %d\n",NDO_DATA_OUTPUT);
+//printf("(es[2]==NULL)?"":es[2] %s\n",(es[2]==NULL)?"":es[2]);
+//printf("NDO_DATA_LONGOUTPUT %d\n",NDO_DATA_LONGOUTPUT);
@@ -323,5 +323,5 @@
+//printf("NDO_API_ENDDATA %d\n",NDO_API_ENDDATA);
+
snprintf(temp_buffer,sizeof(temp_buffer)-1
- ,"\n%d:\n%d=%d\n%d=%d\n%d=%d\n%d=%ld.%ld\n%d=%d\n%d=%ld.%ld\n%d=%ld.%ld\n%d=%s\n%d=%s\n%d=%d\n%d=%d\n%d=%s\n%d=%s\n%d=%s\n%d=%s\n%d=%d\n%d=%d\n%d=%d\n%d\n\n"
+ ,"\n%d:\n%d=%d\n%d=%d\n%d=%d\n%d=%ld.%ld\n%d=%d\n%d=%ld.%ld\n%d=%ld.%ld\n%d=%s\n%d=%s\n%d=%d\n%d=%d\n%d=%d\n%d=%s\n%d=%s\n%d=%s\n%d=%d\n%d=%d\n%d=%d\n%d\n\n"
,NDO_API_NOTIFICATIONDATA
Deleted: trunk/patches/ndoutils_pk2.patch
===================================================================
--- trunk/patches/ndoutils_pk2.patch 2012-12-19 15:47:09 UTC (rev 158)
+++ trunk/patches/ndoutils_pk2.patch 2012-12-19 16:04:34 UTC (rev 159)
@@ -1,21 +0,0 @@
-diff -Bbur ndoutils-2-0.orig/src/ndomod.c ndoutils-2-0/src/ndomod.c
---- ndoutils-2-0.orig/src/ndomod.c 2012-11-29 16:43:36.000000000 +0000
-+++ ndoutils-2-0/src/ndomod.c 2012-11-29 16:41:46.000000000 +0000
-@@ -1821,7 +1821,7 @@
- printf("NDO_DATA_CURRENTNOTIFICATIONNUMBER %d\n",NDO_DATA_CURRENTNOTIFICATIONNUMBER);
- printf("notdata->notification_number %d\n",notdata->notification_number);
- printf("NDO_DATA_STATE %d\n",NDO_DATA_STATE);
--printf("notdata->state %s\n",notdata->state);
-+printf("notdata->state %d\n",notdata->state);
- printf("NDO_DATA_OUTPUT %d\n",NDO_DATA_OUTPUT);
- printf("(es[2]==NULL)?"":es[2] %s\n",(es[2]==NULL)?"":es[2]);
- printf("NDO_DATA_LONGOUTPUT %d\n",NDO_DATA_LONGOUTPUT);
-@@ -1837,7 +1837,7 @@
- printf("NDO_API_ENDDATA %d\n",NDO_API_ENDDATA);
-
- snprintf(temp_buffer,sizeof(temp_buffer)-1
-- ,"\n%d:\n%d=%d\n%d=%d\n%d=%d\n%d=%ld.%ld\n%d=%d\n%d=%ld.%ld\n%d=%ld.%ld\n%d=%s\n%d=%s\n%d=%d\n%d=%d\n%d=%s\n%d=%s\n%d=%s\n%d=%s\n%d=%d\n%d=%d\n%d=%d\n%d\n\n"
-+ ,"\n%d:\n%d=%d\n%d=%d\n%d=%d\n%d=%ld.%ld\n%d=%d\n%d=%ld.%ld\n%d=%ld.%ld\n%d=%s\n%d=%s\n%d=%d\n%d=%d\n%d=%d\n%d=%s\n%d=%s\n%d=%s\n%d=%d\n%d=%d\n%d=%d\n%d\n\n"
- ,NDO_API_NOTIFICATIONDATA
- ,NDO_DATA_TYPE
- ,notdata->type
_______________________________________________
Opsview-checkins mailing list
[email protected]
http://lists.opsview.org/lists/listinfo/opsview-checkins
