diff options
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | Completion/Debian/Command/_aptitude | 35 |
2 files changed, 38 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog index a0a73df9e..e4016aa3a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -15,6 +15,9 @@ * 29523: Completion/Debian/Command/_git-buildpackage: Use "#desc:" line for _git third-party add-on completion description. + * Daniel Bolton: 29529: Completion/Debian/Command/_aptitude: Complete + format specifiers with the `-F' option. + 2011-06-30 Frank Terbeck <ft@bewatermyfriend.org> * 29526: Functions/VCS_Info/vcs_info: Set `max-exports' early @@ -15074,5 +15077,5 @@ ***************************************************** * This is used by the shell to define $ZSH_PATCHLEVEL -* $Revision: 1.5388 $ +* $Revision: 1.5389 $ ***************************************************** diff --git a/Completion/Debian/Command/_aptitude b/Completion/Debian/Command/_aptitude index bfec49730..2c462e462 100644 --- a/Completion/Debian/Command/_aptitude +++ b/Completion/Debian/Command/_aptitude @@ -13,6 +13,39 @@ ${${(M)${(f)"$(</etc/apt/sources.list)"}\ #}}} } +# Helper function for -F / --display-format +function _aptitude_format_strings() { + _values -s , 'format string' \ + '%%[Literal %]' \ + '%#number[Parameter replacement]' \ + '%a[Action flag]' \ + '%A[Action]' \ + '%B[Broken count]' \ + '%c[Current state flag]' \ + '%C[Current state]' \ + '%d[Description]' \ + '%H[Hostname]' \ + '%i[Pin priority]' \ + '%I[Installed size]' \ + '%m[Maintainer]' \ + '%M[Automatic flag]' \ + '%n[Program version]' \ + '%N[Program name]' \ + '%o[Download size]' \ + '%p[Package name]' \ + '%P[Priority]' \ + '%r[Reverse depends count]' \ + '%R[Abbreviated priority]' \ + '%s[Section]' \ + '%S[Trust status]' \ + '%t[Archive]' \ + '%T[Tagged]' \ + '%u[Disk usage change]' \ + '%v[Current version]' \ + '%V[Candidate version]' \ + '%Z[Size change]' +} + _arguments -C \ '(- 1 *)'{-h,--help}'[display help information]' \ '(- 1 *)--version[display version information]' \ @@ -20,7 +53,7 @@ _arguments -C \ '(-d --download-only)'{-d,--download-only}"[just download packages - don\'t install]" \ '(-P --prompt)'{-P,--prompt}'[always display a prompt]' \ '(-y --assume-yes)'{-y,--assume-yes}'[assume yes answer to questions]' \ - '(-F --display-format)'{-F,--display-format}'[specify output format for search command]:format' \ + '(-F --display-format)'{-F,--display-format}'[specify output format for search command]:format:_aptitude_format_strings' \ '(-O --sort)'{-O,--sort}'[specify sort order]:sort order:()' \ '(-w --width)'{-w,--width}'[specify output width]:width' \ '-f[aggressivley try to fix dependencies of broken packages]' \ |