[tango] 06/07: try to fix 806409

[Frédéric-Emmanuel Picca]

This is an automated email from the git hooks/post-receive script.

picca pushed a commit to branch master
in repository tango.

commit 9570f8b7c970ec2ceced6bf66575a1c3edb8c43e
Author: Picca Frédéric-Emmanuel <picca at debian.org>
Date:   Sat Mar 12 11:54:41 2016 +0100

    try to fix 806409
---
 debian/changelog                  | 1 +
 debian/tango-accesscontrol.init.d | 2 +-
 debian/tango-db.init.d            | 6 +++---
 debian/tango-starter.init.d       | 2 +-
 4 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 1bbed81..16df71a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ tango (9.2.1+dfsg-1~exp1) experimental; urgency=medium
 
   * Imported Upstream version 9.2.1+dfsg
   * Bump Standards-Version to 3.9.7 (nothing to do)
+  * Update xxx.init.d script (Closes: #806409)
   * debian/control
     - Update Vcs-Git
     - Add new binary packages:
diff --git a/debian/tango-accesscontrol.init.d b/debian/tango-accesscontrol.init.d
index d69f96b..edb95ef 100644
--- a/debian/tango-accesscontrol.init.d
+++ b/debian/tango-accesscontrol.init.d
@@ -19,7 +19,7 @@ DESC="Tango Control System - accesscontrol"
 NAME=tango-accesscontrol
 NAME_REAL=TangoAccessControl
 CONFFILE=/etc/tangorc
-CANON_HOST=`grep TANGO_HOST $CONFFILE | awk -F ":" '{print $1}' | awk -F "=" '{print $2}' | awk -F "." '{print $1}'`
+CANON_HOST=`grep "^ *TANGO_HOST" $CONFFILE | awk -F ":" '{print $1}' | awk -F "=" '{print $2}' | awk -F "." '{print $1}'`
 DAEMON=/usr/lib/tango/$NAME_REAL
 DAEMON_ARGS="1"
 DAEMON_USER=tango
diff --git a/debian/tango-db.init.d b/debian/tango-db.init.d
index 7073308..e5660ff 100644
--- a/debian/tango-db.init.d
+++ b/debian/tango-db.init.d
@@ -21,9 +21,9 @@ DESC="Tango Control System - database"
 NAME=tango-db
 NAME_REAL=DataBaseds
 CONFFILE=/etc/tangorc
-PORT=`grep TANGO_HOST $CONFFILE | awk -F ":" '{print $2}'`
-HOST=`grep TANGO_HOST $CONFFILE | awk -F ":" '{print $1}' | awk -F "=" '{print $2}'`
-CANON_HOST=`grep TANGO_HOST $CONFFILE | awk -F ":" '{print $1}' | awk -F "=" '{print $2}' | awk -F "." '{print $1}'`
+PORT=`grep "^ *TANGO_HOST" $CONFFILE | awk -F ":" '{print $2}'`
+HOST=`grep "^ *TANGO_HOST" $CONFFILE | awk -F ":" '{print $1}' | awk -F "=" '{print $2}'`
+CANON_HOST=`grep "^ *TANGO_HOST" $CONFFILE | awk -F ":" '{print $1}' | awk -F "=" '{print $2}' | awk -F "." '{print $1}'`
 DAEMON=/usr/lib/tango/$NAME_REAL
 DAEMON_USER=tango
 DAEMON_GROUP=tango
diff --git a/debian/tango-starter.init.d b/debian/tango-starter.init.d
index f3671f8..d7adcb5 100644
--- a/debian/tango-starter.init.d
+++ b/debian/tango-starter.init.d
@@ -19,7 +19,7 @@ DESC="Tango Control System - starter"
 NAME=tango-starter
 NAME_REAL=Starter
 CONFFILE=/etc/tangorc
-CANON_HOST=`grep TANGO_HOST $CONFFILE | awk -F ":" '{print $1}' | awk -F "=" '{print $2}' | awk -F "." '{print $1}'`
+CANON_HOST=`grep "^ *TANGO_HOST" $CONFFILE | awk -F ":" '{print $1}' | awk -F "=" '{print $2}' | awk -F "." '{print $1}'`
 DAEMON=/usr/lib/tango/$NAME_REAL
 DAEMON_ARGS=`hostname`
 DAEMON_USER=tango

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/tango.git