On Mon, 2009-09-14 at 21:10 -0700, Steve Langasek wrote:
> On Mon, Sep 14, 2009 at 09:29:59PM +0200, Roland Clobus wrote:
> > Package: pioneers-console
> > Version: 0.12.2-5
> > Severity: normal
> > File: pioneers
> > Tags: patch
> 
> > The settings in /etc/default/pioneers-console are not used, because the
> > logic in /etc/init.d/pioneers-console is reversed.

> Er, only the second of these was reversed - the second one has been changed
> so that if PORT_RANGE is empty, we pass "--port-range <blank>", which seems
> obviously incorrect since it should be given a range as an argument.

Oops, I was too early when sending the patch. The new attached patch
correctly prepends the commands before the values that need to be passed
on the commandline.

> Of course, this "port-range" option is *completely undocumented* in
the
> program --help and the manpage... what gives there? :/

The --port-range is shown when 'pioneers-meta-server --help' is invoked,
and only the -p is shown in the man page.

With kind regards,
Roland Clobus
Index: pioneers-console.init
===================================================================
--- pioneers-console.init	(revision 1460)
+++ pioneers-console.init	(working copy)
@@ -38,14 +38,14 @@
 	. $CONFIG_FILE
 fi
 
-test -z "$PORT_RANGE" || PORT_RANGE="--port-range $PORT_RANGE"
-test -z "$META_SERVER_NAME" || META_SERVER_NAME="`dnsdomainname --fqdn`"
+test "$PORT_RANGE" && PORT_RANGE="--port-range $PORT_RANGE"
+test "$META_SERVER_NAME" && META_SERVER_NAME="--servername $META_SERVER_NAME"
 
 export PIONEERS_META_SERVER
 NAME="Pioneers meta-server"
 DAEMON=/usr/games/pioneers-meta-server
 ARGS="--pidfile $PIDFILE --exec $DAEMON $ARGS"
-START_ARGS="--start $ARGS -- --daemon $PORT_RANGE $META_SERVER_ARGS --servername $META_SERVER_NAME"
+START_ARGS="--start $ARGS -- --daemon $PORT_RANGE $META_SERVER_ARGS $META_SERVER_NAME"
 STOP_ARGS="--stop $ARGS"
 
 if test ! -x "$DAEMON"; then

Attachment: signature.asc
Description: This is a digitally signed message part

Reply via email to