[Pkg-apache-commits] [SCM] Debian packaging for apache2 (Apache HTTPD 2.x) branch, next, updated. fdb6503c66bbafea8e92a86c26fa2653ee503253

[Arno Töll]

The following commit has been merged in the next branch:
commit 257a2cc8609877b9acfd17d78113d5bbada66890
Author: Ludovico Gardenghi <garden at debian.org>
Date:   Fri Feb 24 21:58:26 2012 +0100

    bash_completion: a2{en,dis}site don't strip .conf
    
    ...nor .load
    Fixes: #657492
    
    Signed-off-by: Arno Töll <debian at toell.net>

diff --git a/debian/bash_completion/apache2-common b/debian/bash_completion/apache2-common
index c24b2e5..0204589 100644
--- a/debian/bash_completion/apache2-common
+++ b/debian/bash_completion/apache2-common
@@ -1,12 +1,22 @@
 # bash completion for Debian apache2 configuration tools
 # $Id: apache2,v 1.1 2005/03/16 22:51:19 guillaume Exp $
 
-_apache2_modsites()
+_apache2_allcomp()
 {
-       COMPREPLY=( $( compgen -W '$( command ls /etc/apache2/$1 2>/dev/null \
+       command ls /etc/apache2/$1 2>/dev/null
+}
+
+_apache2_mods()
+{
+       COMPREPLY=( $( compgen -W '$( _apache2_allcomp $1 \
                | sed -e 's/[.]load$//' -e 's/[.]conf$//' )' -- $cur  ) )
 }
 
+_apache2_sites()
+{
+       COMPREPLY=( $( compgen -W '$( _apache2_allcomp $1 )' -- $cur  ) )
+}
+
 _a2enmod()
 {
        local cur
@@ -14,7 +24,7 @@ _a2enmod()
        COMPREPLY=()
        cur=${COMP_WORDS[COMP_CWORD]}
 
-       _apache2_modsites mods-available
+       _apache2_mods mods-available
 }
 complete -F _a2enmod a2enmod
 
@@ -25,7 +35,7 @@ _a2ensite()
        COMPREPLY=()
        cur=${COMP_WORDS[COMP_CWORD]}
 
-       _apache2_modsites sites-available
+       _apache2_sites sites-available
 
 }
 complete -F _a2ensite a2ensite
@@ -37,7 +47,7 @@ _a2dismod()
        COMPREPLY=()
        cur=${COMP_WORDS[COMP_CWORD]}
 
-       _apache2_modsites mods-enabled
+       _apache2_mods mods-enabled
 }
 complete -F _a2dismod a2dismod
 
@@ -48,7 +58,7 @@ _a2dissite()
        COMPREPLY=()
        cur=${COMP_WORDS[COMP_CWORD]}
 
-       _apache2_modsites sites-enabled
+       _apache2_sites sites-enabled
 
 }
 complete -F _a2dissite a2dissite

-- 
Debian packaging for apache2 (Apache HTTPD 2.x)