Bug#659581: pbuilder: does not autocomplete filename in all cases correctly

[Maarten Bezemer]

Package: pbuilder
Version: 0.204
Severity: normal
Tags: patch
User: ubuntu-devel at lists.ubuntu.com
Usertags: origin-ubuntu precise ubuntu-patch


When the pbuilder commands are used without starting with -- the auto completion of filenames does not work.
Also, the filename auto completion does not take directories into account.

*** /tmp/tmp_zb98I
In Ubuntu, the attached patch was applied to achieve the following:

  * Auto complete filenames not working when not adding -- to the command (LP: #770529)
  * Add directories to filename auto completion


Thanks for considering the patch.


-- System Information:
Debian Release: wheezy/sid
  APT prefers oneiric-security
  APT policy: (990, 'oneiric-security'), (900, 'oneiric-updates'), (500, 'oneiric'), (400, 'oneiric-proposed'), (100, 'oneiric-backports')
Architecture: amd64 (x86_64)

Kernel: Linux 3.0.0-15-generic (SMP w/8 CPU cores)
Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
-------------- next part --------------
=== modified file 'bash_completion.d/pbuilder'
--- bash_completion.d/pbuilder	2010-06-23 07:21:11 +0000
+++ bash_completion.d/pbuilder	2012-02-12 00:35:04 +0000
@@ -14,14 +14,14 @@
 
     COMPREPLY=()
     cur=${COMP_WORDS[COMP_CWORD]}
-    options='--create --update --build --login --execute --dumpconfig'
+    options='--create --update --build --login --execute --dumpconfig create update build login execute dumpconfig'
 
     if [ $COMP_CWORD -eq 1 ]; then
         COMPREPLY=( $( compgen -W "$options" | grep "^$cur" ) )
-    elif [ "${COMP_WORDS[1]}" = --build ]; then
+    elif [ "${COMP_WORDS[1]}" = --build -o "${COMP_WORDS[1]}" = build ]; then
         COMPREPLY=( $( compgen -o filenames -G "$cur*.dsc" ) )
     fi
 
     return 0
 }
-[ "$have" ] && complete -F _pbuilder -o filenames pbuilder
+[ "$have" ] && complete -F _pbuilder -o filenames -o plusdirs pbuilder

=== modified file 'debian/changelog'