[Pkg-apache-commits] r921 - in /trunk/apache2: changelog patches/050_enhance_apache2ctl.dpatch

[sf at alioth.debian.org]

Author: sf
Date: Sun May 17 08:24:18 2009
New Revision: 921

URL: http://svn.debian.org/wsvn/pkg-apache/?sc=1&rev=921
Log:
improve help output of apache2ctl

Modified:
    trunk/apache2/changelog
    trunk/apache2/patches/050_enhance_apache2ctl.dpatch

Modified: trunk/apache2/changelog
URL: http://svn.debian.org/wsvn/pkg-apache/trunk/apache2/changelog?rev=921&op=diff
==============================================================================
--- trunk/apache2/changelog (original)
+++ trunk/apache2/changelog Sun May 17 08:24:18 2009
@@ -14,6 +14,7 @@
     Jari Aalto for the patch. (Closes: #523398)
   * Extend the gnome-vfs DAV workaround to gvfs (closes: #522845).
   * Add more info to check_forensic man page (closes: #528424).
+  * Make "apache2ctl help" point to help on apache2 args (closes: #528425).
 
  -- Peter Samuelson <peter at p12n.org>  Tue, 31 Mar 2009 22:21:19 -0500
 

Modified: trunk/apache2/patches/050_enhance_apache2ctl.dpatch
URL: http://svn.debian.org/wsvn/pkg-apache/trunk/apache2/patches/050_enhance_apache2ctl.dpatch?rev=921&op=diff
==============================================================================
--- trunk/apache2/patches/050_enhance_apache2ctl.dpatch (original)
+++ trunk/apache2/patches/050_enhance_apache2ctl.dpatch Sun May 17 08:24:18 2009
@@ -8,8 +8,8 @@
 
 @DPATCH@
 diff -urNad trunk~/support/apachectl.in trunk/support/apachectl.in
---- trunk~/support/apachectl.in	2008-01-31 18:29:05.711617810 +0100
-+++ trunk/support/apachectl.in	2008-01-31 18:29:32.497144231 +0100
+--- trunk~/support/apachectl.in	2009-05-17 10:18:07.998158064 +0200
++++ trunk/support/apachectl.in	2009-05-17 10:22:03.232686445 +0200
 @@ -40,28 +40,31 @@
  # |||||||||||||||||||| START CONFIGURATION SECTION  ||||||||||||||||||||
  # --------------------                              --------------------
@@ -50,15 +50,16 @@
  # --------------------                              --------------------
  # ||||||||||||||||||||   END CONFIGURATION SECTION  ||||||||||||||||||||
  
-@@ -71,13 +74,32 @@
+@@ -71,13 +74,33 @@
  fi
  
  ERROR=0
 -if [ "x$ARGV" = "x" ] ; then 
 -    ARGV="-h"
-+if [ "x$ARGV" = "x" ] || [ "x$ARGV" = "xusage" ] || [ "x$ARGV" = "x--help" ]; then 
-+    echo "Usage: $0 start|stop|restart|graceful|graceful-stop|configtest|status|fullstatus" >&2
++if [ "x$ARGV" = "x" ] || [ "x$ARGV" = "xusage" ] || [ "x$ARGV" = "xhelp" ] || [ "x$ARGV" = "x--help" ]; then 
++    echo "Usage: $0 start|stop|restart|graceful|graceful-stop|configtest|status|fullstatus|help" >&2
 +    echo "       $0 <apache2 args>" >&2
++    echo "       $0 -h            (for help on <apache2 args>)" >&2
 +    exit 1
  fi
  
@@ -87,7 +88,7 @@
      ERROR=$?
      ;;
  startssl|sslstart|start-SSL)
-@@ -87,7 +109,7 @@
+@@ -87,7 +110,7 @@
      ERROR=2
      ;;
  configtest)
@@ -96,7 +97,7 @@
      ERROR=$?
      ;;
  status)
-@@ -97,7 +119,7 @@
+@@ -97,7 +120,7 @@
      $LYNX $STATUSURL
      ;;
  *)