[Pkg-apache-commits] r1155 - in /trunk/apache2: bash_completion changelog

[sf at alioth.debian.org]

Author: sf
Date: Tue Mar  2 19:58:21 2010
New Revision: 1155

URL: http://svn.debian.org/wsvn/pkg-apache/?sc=1&rev=1155
Log:
fix bash completion

Modified:
    trunk/apache2/bash_completion
    trunk/apache2/changelog

Modified: trunk/apache2/bash_completion
URL: http://svn.debian.org/wsvn/pkg-apache/trunk/apache2/bash_completion?rev=1155&op=diff
==============================================================================
--- trunk/apache2/bash_completion (original)
+++ trunk/apache2/bash_completion Tue Mar  2 19:58:21 2010
@@ -4,7 +4,7 @@
 _apache2_modsites()
 {
        COMPREPLY=( $( compgen -W '$( command ls /etc/apache2/$1 2>/dev/null \
-               | sed -e 's/\.load//' -e 's/\.conf//' )' -- $cur  ) )
+               | sed -e 's/[.]load$//' -e 's/[.]conf$//' )' -- $cur  ) )
 }
 
 _a2enmod()

Modified: trunk/apache2/changelog
URL: http://svn.debian.org/wsvn/pkg-apache/trunk/apache2/changelog?rev=1155&op=diff
==============================================================================
--- trunk/apache2/changelog (original)
+++ trunk/apache2/changelog Tue Mar  2 19:58:21 2010
@@ -1,3 +1,10 @@
+apache2 (2.2.14-8) UNRELEASED; urgency=low
+
+  * Fix bash completion for a2ensite if the site name contains 'conf' or
+    'load'. Closes: #572232
+
+ -- Stefan Fritsch <sf at debian.org>  Tue, 02 Mar 2010 20:56:18 +0100
+
 apache2 (2.2.14-7) unstable; urgency=low
 
   * Fix potential memory leaks related to the usage of apr_brigade_destroy().