Просмотр исходного кода

utils/start-stop-daemon.c: --name is now allowed on the command line
(imported from branch v1_8).

Adam Heath лет назад: 25
Родитель
Сommit
e83c5b70e4
3 измененных файлов с 14 добавлено и 2 удалено
  1. 6 0
      ChangeLog
  2. 6 0
      debian/changelog
  3. 2 2
      utils/start-stop-daemon.c

+ 6 - 0
ChangeLog

@@ -1,9 +1,15 @@
+=======
 Sat Dec 30 23:08:00 CET 2000 Wichert Akkerman <wakkerma@debian.org>
 
   * 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 <doogie@debian.org>
+  
+  * utils/start-stop-daemon.c: --name is now allowed on the command
+    line.
+
 Fri Dec 29 12:39:09 CST 2000 Adam Heath <doogie@debian.org>
 
   * lib/parse.c: Properly parse control files that only have one

+ 6 - 0
debian/changelog

@@ -8,6 +8,12 @@ dpkg (1.9.0) unstable; urgency=low
 
  -- Wichert Akkerman <wakkerma@debian.org>  UNRELEASED
 
+dpkg (1.8.1) unstable; urgency=low
+
+  * Make --name a valid option.  Closes: #31206, #51953.
+
+ -- Wichert Akkerman <wakkerma@debian.org>  UNRELEASED
+
 dpkg (1.8.0) unstable; urgency=low
 
   * Add -k|--symlink option to dpkg-name.  Closes: #35040

+ 2 - 2
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;