The branch, master has been updated
via 925bf488839ed0442700d80c0df681c34bf2ec87 (commit)
from 188ea062f07930f9e38f9ccb6f13058a74a6de9c (commit)
- Shortlog ------------------------------------------------------------
925bf48 s-s-d: Clarify in help output that --name is one of the required options
Summary of changes:
ChangeLog | 5 +++++
debian/changelog | 2 ++
utils/start-stop-daemon.c | 12 +++++++-----
3 files changed, 14 insertions(+), 5 deletions(-)
-----------------------------------------------------------------------
Details of changes:
commit 925bf488839ed0442700d80c0df681c34bf2ec87
Author: Guillem Jover <[EMAIL PROTECTED]>
Date: Fri Jan 18 08:37:07 2008 +0200
s-s-d: Clarify in help output that --name is one of the required options
Closes: #354999
diff --git a/ChangeLog b/ChangeLog
index 4392d28..774a5c2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
2008-01-18 Guillem Jover <[EMAIL PROTECTED]>
+ * utils/start-stop-daemon.c (do_help): Coalesce mandatory options
+ into a single paragraph, and state that at least one is required.
+
+2008-01-18 Guillem Jover <[EMAIL PROTECTED]>
+
* configure.ac (AC_CHECK_SIZEOF): Quote parameters.
2008-01-18 Guillem Jover <[EMAIL PROTECTED]>
diff --git a/debian/changelog b/debian/changelog
index d690019..e2e3409 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -19,6 +19,8 @@ dpkg (1.14.16) UNRELEASED; urgency=low
* Additionally check if errno is EEXIST after rmdir(2), as SUSv3 specifies
that on non-empty directories it can either return that or ENOTEMPTY.
This fixes run time problems on Solaris.
+ * Fix start-stop-daemon --help output to state that --name is one of the
+ possible required options to use. Closes: #354999
[ Frank Lichtenheld ]
* Make the -L option of dpkg-parsechangelog actually work (it's
diff --git a/utils/start-stop-daemon.c b/utils/start-stop-daemon.c
index 2fb7574..1fd0e87 100644
--- a/utils/start-stop-daemon.c
+++ b/utils/start-stop-daemon.c
@@ -346,15 +346,17 @@ do_help(void)
" -H|--help print help information\n"
" -V|--version print version\n"
"\n"
-"Options (at least one of --exec|--pidfile|--user is required):\n"
-" -x|--exec <executable> program to start/check if it is running\n"
+"Mandatory options (at least one is required):\n"
" -p|--pidfile <pid-file> pid file to check\n"
+" -x|--exec <executable> program to start/check if it is running\n"
+" -n|--name <process-name> stop processes with this name\n"
+" -u|--user <username|uid> stop processes owned by this user\n"
+"\n"
+"Options:\n"
+" -g|--group <group|gid> run process as this group\n"
" -c|--chuid <name|uid[:group|gid]>\n"
" change to this user/group before starting\n"
" process\n"
-" -u|--user <username>|<uid> stop processes owned by this user\n"
-" -g|--group <group|gid> run process as this group\n"
-" -n|--name <process-name> stop processes with this name\n"
" -s|--signal <signal> signal to send (default TERM)\n"
" -a|--startas <pathname> program to start (default is <executable>)\n"
" -r|--chroot <directory> chroot to <directory> before starting\n"
--
dpkg's main repository
--
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]
