[Pkg-samba-maint] r3933 - trunk/ctdb/debian

[sathieu at alioth.debian.org]

Author: sathieu
Date: 2011-10-18 19:38:41 +0000 (Tue, 18 Oct 2011)
New Revision: 3933

Modified:
   trunk/ctdb/debian/ctdb.init
Log:
ctdb.init: don't use eval_gettext

Modified: trunk/ctdb/debian/ctdb.init
===================================================================
--- trunk/ctdb/debian/ctdb.init	2011-10-18 19:32:15 UTC (rev 3932)
+++ trunk/ctdb/debian/ctdb.init	2011-10-18 19:38:41 UTC (rev 3933)
@@ -77,16 +77,6 @@
     . /etc/rc.d/init.d/functions
 fi
 
-# gettext
-if [ -f /usr/bin/gettext.sh ] ; then
-    . /usr/bin/gettext.sh
-fi
-if ! type 'eval_gettext' >/dev/null; then
-    eval_gettext() {
-        echo -n "$1" | (export PATH `envsubst --variables "$1"`; envsubst "$1")
-    }
-fi
-
 # rc.status
 [ -f /etc/rc.status ] && {
     . /etc/rc.status
@@ -375,7 +365,7 @@
         sleep 1
         count=$(($count + 1))
         [ $count -gt 10 ] && {
-	        eval_gettext "killing ctdbd "
+	        echo -n "killing ctdbd "
 	        pkill -9 -f $ctdbd
 	        pkill -9 -f $CTDB_BASE/events.d/
         }
@@ -474,8 +464,7 @@
         fi
         ;;
     *)
-        eval_gettext "Usage: \$0 {start|stop|restart|status|cron|condrestart}" >&2
-        echo >&2
+        echo "Usage: \$0 {start|stop|restart|status|cron|condrestart}" >&2
         exit 1
         ;;
 esac