From: Adam Heath Date: Sun, 31 Dec 2000 05:12:44 +0000 (+0000) Subject: utils/start-stop-daemon.c: --name is now allowed on the command line X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e83c5b70e433ec12ac1d9c6b5a742d3bfb58a2c7;p=dpkg utils/start-stop-daemon.c: --name is now allowed on the command line (imported from branch v1_8). --- diff --git a/ChangeLog b/ChangeLog index 21eda267..2041bd45 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,9 +1,15 @@ +======= Sat Dec 30 23:08:00 CET 2000 Wichert Akkerman * doc/Makefile.in: add fr to SUBDIRS * doc/fr: new directory with French manpages * THANKS: add philippe batailler who translated the manpages to French +Sat Dec 30 20:38:20 CST 2000 Adam Heath + + * utils/start-stop-daemon.c: --name is now allowed on the command + line. + Fri Dec 29 12:39:09 CST 2000 Adam Heath * lib/parse.c: Properly parse control files that only have one diff --git a/debian/changelog b/debian/changelog index e317c0ab..6777ba43 100644 --- a/debian/changelog +++ b/debian/changelog @@ -8,6 +8,12 @@ dpkg (1.9.0) unstable; urgency=low -- Wichert Akkerman UNRELEASED +dpkg (1.8.1) unstable; urgency=low + + * Make --name a valid option. Closes: #31206, #51953. + + -- Wichert Akkerman UNRELEASED + dpkg (1.8.0) unstable; urgency=low * Add -k|--symlink option to dpkg-name. Closes: #35040 diff --git a/utils/start-stop-daemon.c b/utils/start-stop-daemon.c index 067a6b55..7906620f 100644 --- a/utils/start-stop-daemon.c +++ b/utils/start-stop-daemon.c @@ -348,8 +348,8 @@ parse_options(int argc, char * const *argv) if (start == stop) badusage("need one of --start or --stop"); - if (!execname && !pidfile && !userspec) - badusage("need at least one of --exec, --pidfile or --user"); + if (!execname && !pidfile && !userspec && !cmdname) + badusage("need at least one of --exec, --pidfile, --user or --name"); if (!startas) startas = execname;