diff options
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | Completion/Debian/_dpkg | 7 |
2 files changed, 10 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog index d424d9a0b..8bb3c525f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2000-06-16 Clint Adams <schizo@debian.org> + + * 11951: Completion/Debian/_dpkg: replaced _arguments -A + for install and record-avail with an evaluation kludge. + 2000-06-16 Sven Wischnowsky <wischnow@zsh.org> * 11939: Src/Zle/compmatch.c, Src/Zle/compresult.c, Src/Zle/zle_tricky.c: diff --git a/Completion/Debian/_dpkg b/Completion/Debian/_dpkg index 49de7a6af..75d8d0c18 100644 --- a/Completion/Debian/_dpkg +++ b/Completion/Debian/_dpkg @@ -1,7 +1,7 @@ #compdef dpkg dpkg-deb local _dpkg_deb_actions _dpkg_common_actions _dpkg_actions _dpkg_options -local _dpkg_options_recursive +local _dpkg_options_recursive _dpkg_actions_install _dpkg_actions_record_avail local curcontext="$curcontext" context state line expl ret typeset -A opt_args @@ -81,6 +81,8 @@ _dpkg_options=('--abort-after[abort after errors]:number of errors:' \ --{force,refuse,no-force}'--[forcing options]:what:(auto-select downgrade configure-any hold bad-path not-root overwrite overwrite-diverted depends-version depends confnew confold confdef confmiss conflicts architecture overwrite-dir remove-reinstreq remove-essential)') _dpkg_options_recursive=('(--recursive)-R[recursive]' '(-R)--recursive') +_dpkg_actions_install=('(--install)-i[install]' '(-i)--install') +_dpkg_actions_record_avail=('(--record-avail)-A[record available]' '(-A)--record-avail') case "${words[1]:t}" in dpkg) @@ -102,7 +104,8 @@ esac case "$state" in install|record_avail) _funcall ret _dpkg_$state && return ret - _arguments -C -A "-*" -s "$_dpkg_options[@]" \ + _arguments -C -s "$_dpkg_options[@]" \ + "${(@e):-\$_dpkg_actions_${state}}" \ - recur \ '(--recursive)-R[recursive]' \ '(-R)--recursive' \ |