[omd-commits] OMD Git: omd: shinken: removed a leftover patch

git version control git at mathias-kettner.de
Fri Dec 21 14:09:29 CET 2012


Module:   omd
Branch:   master
Commit:   b9ec3079aae2bd34c2ba4355fabd2dcdc7f78b71
URL:      http://omdistro.org/projects/omd/repository/revisions/b9ec3079aae2bd34c2ba4355fabd2dcdc7f78b71

Author:   Gerhard Lausser <gerhard.lausser at consol.de>
Date:     Fri Dec 21 15:18:45 2012 +0300
Commiter: Gerhard Lausser <gerhard.lausser at consol.de>
Date:     Fri Dec 21 15:19:56 2012 +0300

shinken: removed a leftover patch

---

 packages/shinken/Makefile                          |    8 +++---
 ...orrect-livestatus-commands-table.-Fix-520.patch |   26 --------------------
 2 files changed, 4 insertions(+), 30 deletions(-)

diff --git a/packages/shinken/Makefile b/packages/shinken/Makefile
index 3e5f35b..53bd9ca 100644
--- a/packages/shinken/Makefile
+++ b/packages/shinken/Makefile
@@ -69,10 +69,10 @@ export PYTHONPATH
 build:
 	test -f ${SHINKEN_FILE} || wget $(SHINKEN_URL)
 	tar xzf $(SHINKEN_FILE)
-	set -e ; for p in patches/*.patch ; do \
-	    echo "applying $$p..." ; \
-	    ( cd $(SHINKEN) ; patch -p1 -b ) < $$p ; \
-	done
+	#set -e ; for p in patches/*.patch ; do \
+	#    echo "applying $$p..." ; \
+	#    ( cd $(SHINKEN) ; patch -p1 -b ) < $$p ; \
+	#done
 	test -f $(PYRO_FILE) || wget $(PYRO_URL)
 	tar xzf $(PYRO_FILE)
 	test -f $(MP_FILE) || wget $(MP_URL)
diff --git a/packages/shinken/patches/0001-Correct-livestatus-commands-table.-Fix-520.patch b/packages/shinken/patches/0001-Correct-livestatus-commands-table.-Fix-520.patch
deleted file mode 100644
index ec6c803..0000000
--- a/packages/shinken/patches/0001-Correct-livestatus-commands-table.-Fix-520.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From 695d5615fe2be1a1ba46aaa213f15f2c9454ec6e Mon Sep 17 00:00:00 2001
-From: Nicolas DUPEUX <nicolas.dupeux at arkea.com>
-Date: Wed, 5 Sep 2012 15:23:42 +0200
-Subject: [PATCH 1/3] Correct livestatus commands table. Fix #520
- (Fix by: Franky)
-
----
- .../modules/livestatus_broker/livestatus_query.py  |    2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/shinken/modules/livestatus_broker/livestatus_query.py b/shinken/modules/livestatus_broker/livestatus_query.py
-index 9a30f3c..8b8dcd2 100644
---- a/shinken/modules/livestatus_broker/livestatus_query.py
-+++ b/shinken/modules/livestatus_broker/livestatus_query.py
-@@ -538,7 +538,7 @@ class LiveStatusQuery(object):
-     objects_get_handlers = {
-         'hosts':                get_hosts_livedata,
-         'services':             get_services_livedata,
--        'commands':             get_simple_livedata,
-+        'commands':             get_filtered_livedata,
-         'schedulers':           get_simple_livedata,
-         'brokers':              get_simple_livedata,
-         'pollers':              get_simple_livedata,
--- 
-1.7.0.4
-



More information about the omd-commits mailing list