[Pkg-nagios-changes] [SCM] UNNAMED PROJECT branch, debian/master, updated. 810edbdd3feedbfe37f4a65bee50b57b2f60fa2a

[Arthur Gautier]

The following commit has been merged in the debian/master branch:
commit 8ece2aaa35a099297ca37c01ae4b16ae77620421
Author: Arthur Gautier <aga at zenexity.com>
Date:   Tue Feb 28 18:52:37 2012 +0100

    Updates patch files

diff --git a/debian/patches/0001-642297-Fix-init.patch b/debian/patches/0001-642297-Fix-init.patch
new file mode 100644
index 0000000..7a36fa7
--- /dev/null
+++ b/debian/patches/0001-642297-Fix-init.patch
@@ -0,0 +1,24 @@
+From: Arthur Gautier <superbaloo+debian at superbaloo.net>
+Date: Tue, 28 Feb 2012 18:50:07 +0100
+Subject: [PATCH] 0002-642297-Fix-init
+
+---
+ bin/init.d/shinken |    4 +++-
+ 1 files changed, 3 insertions(+), 1 deletions(-)
+
+diff --git a/bin/init.d/shinken b/bin/init.d/shinken
+index 9210bb6..7fa1ef9 100755
+--- a/bin/init.d/shinken
++++ b/bin/init.d/shinken
+@@ -414,7 +414,9 @@ do_stop_() {
+     statusoutput=$(do_status "$1")
+     rc=$?
+     if [ $rc -ne 0 ]; then
+-        failuremsg="Couldn't get status of $1 : $statusoutput"
++        failuremsg="Couldn't get status of $1 : Assuming already stopped"
++        log_success_msg "$failuremsg"
++        rc=0
+     else
+         stopoutput=$(do_stop "$1" 2>&1)
+         rc=$?
+-- 
diff --git a/debian/patches/0002-642297-Fix-init.patch b/debian/patches/0002-642297-Fix-init.patch
deleted file mode 100644
index 1f83545..0000000
--- a/debian/patches/0002-642297-Fix-init.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- a/bin/init.d/shinken     2011-09-22 20:14:20.470007468 +0000
-+++ b/bin/init.d/shinken     2011-09-22 20:24:58.742020660 +0000
-@@ -353,7 +353,9 @@
-     statusoutput=$(do_status "$1")
-     rc=$?
-     if [ $rc -ne 0 ]; then
--        failuremsg="Couldn't get status of $1 : $statusoutput"
-+        failuremsg="Couldn't get status of $1 : Assuming already stopped"
-+        log_success_msg "$failuremsg"
-+        rc=0
-     else
-         stopoutput=$(do_stop "$1" 2>&1)
-         rc=$?
diff --git a/debian/patches/0002-nagios-path-setup.patch b/debian/patches/0002-nagios-path-setup.patch
new file mode 100644
index 0000000..1d3d693
--- /dev/null
+++ b/debian/patches/0002-nagios-path-setup.patch
@@ -0,0 +1,23 @@
+From: Arthur Gautier <superbaloo+debian at superbaloo.net>
+Date: Tue, 28 Feb 2012 18:50:07 +0100
+Subject: [PATCH] 0003-nagios-path-setup
+
+---
+ setup.cfg |    4 ++--
+ 1 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/setup.cfg b/setup.cfg
+index 0714bd6..0109ed6 100644
+--- a/setup.cfg
++++ b/setup.cfg
+@@ -1,7 +1,7 @@
+ [install]
+ #sysconfigdir = /etc
+ etc-path=/etc/shinken
+-var-path=/var/lib/shinken
+-run-path=/var/run/shinken
++var-path=/var/lib/nagios
++run-path=/var/run/nagios
+ log-path=/var/log/shinken
+ plugins-path=/usr/lib/nagios/plugins
+-- 
diff --git a/debian/patches/0003-Fix-buildpath.patch b/debian/patches/0003-Fix-buildpath.patch
new file mode 100644
index 0000000..a4755b3
--- /dev/null
+++ b/debian/patches/0003-Fix-buildpath.patch
@@ -0,0 +1,22 @@
+From: Arthur Gautier <aga at zenexity.com>
+Date: Tue, 28 Feb 2012 18:51:07 +0100
+Subject: [PATCH] Fix buildpath
+
+---
+ setup.py |    2 ++
+ 1 files changed, 2 insertions(+), 0 deletions(-)
+
+diff --git a/setup.py b/setup.py
+index 8dea452..9d89be1 100644
+--- a/setup.py
++++ b/setup.py
+@@ -228,6 +228,8 @@ class build_config(Command):
+         #Creating some needed directories
+         discovery_dir = os.path.join(self.build_dir + "/objects/discovery")
+         for dirname in [self.var_path,self.run_path,self.log_path,discovery_dir]:
++            if self.build_base:
++                dirname = self.build_base +"/"+ dirname
+             if not os.path.exists(dirname):
+                 os.makedirs(dirname)
+ 
+-- 
diff --git a/debian/patches/0003-nagios-path-setup.patch b/debian/patches/0003-nagios-path-setup.patch
deleted file mode 100644
index 5cfeddb..0000000
--- a/debian/patches/0003-nagios-path-setup.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff --git a/setup.cfg b/setup.cfg
-index 0714bd6..0109ed6 100644
---- a/setup.cfg
-+++ b/setup.cfg
-@@ -1,7 +1,7 @@
- [install]
- #sysconfigdir = /etc
- etc-path=/etc/shinken
--var-path=/var/lib/shinken
--run-path=/var/run/shinken
-+var-path=/var/lib/nagios
-+run-path=/var/run/nagios
- log-path=/var/log/shinken
- plugins-path=/usr/lib/nagios/plugins
diff --git a/debian/patches/series b/debian/patches/series
index 6a1e5c0..01f102e 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
-0002-642297-Fix-init.patch
-0003-nagios-path-setup.patch
+0001-642297-Fix-init.patch
+0002-nagios-path-setup.patch
+0003-Fix-buildpath.patch

-- 
UNNAMED PROJECT