diff options
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | Completion/Debian/Command/_apt | 41 |
2 files changed, 45 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog index f533d7ee7..e68ed6d5d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2016-09-18 Daniel Shahaf <d.s@daniel.shahaf.name> + + * 39374: Completion/Debian/Command/_apt: Complete package + versions in the 'packagename=<version>' syntax. + 2016-09-17 Daniel Shahaf <d.s@daniel.shahaf.name> * 39356 (tweaked, c.f. Bart 39358): Etc/BUGS: Remove fixed items, diff --git a/Completion/Debian/Command/_apt b/Completion/Debian/Command/_apt index a46c3264a..d92d2f884 100644 --- a/Completion/Debian/Command/_apt +++ b/Completion/Debian/Command/_apt @@ -464,7 +464,11 @@ _apt-get () { \( \ /$'install\0'\|$'download\0'\|$'source\0'\|$'build-dep\0'/ \ /$'[^\0]#\0'/ ':packages::_deb_packages "$expl_packages[@]" avail' \# \ - /$'[^\0/]#/'/ /$'[^\0/]#\0'/ ':release name::_apt_releases' \) \| \ + \( \ + /$'[^\0/]#/'/ /$'[^\0/]#\0'/ ':release name::_apt_releases' \| \ + /$'[^\0=]#='/ /$'[^\0=]#\0'/ ':package version::_apt_versions_of_binary_package' \ + \) \ + \) \| \ /$'remove\0'/ /$'[^\0]#\0'/ ':packages::_deb_packages "$expl_packages[@]" installed' \# \| \ /$'purge\0'/ /$'[^\0]#\0'/ ':packages::_deb_packages "$expl_packages[@]" installed' \# \| \ /$'dist-upgrade\0'/ \| \ @@ -614,6 +618,41 @@ _apt_releases () { _tags apt-releases && compadd -a _apt_releases } +# Complete versions of the package named in $match[1]. +# +# Interpret the package name as a binary package (even if there is +# a source package by that name, too). +_apt_versions_of_binary_package() { + local package_name=${match[1]%=} # $match was set by _regex_arguments + local line + local name version source + local -a kv + + for line in ${(f)"$(_call_program versions-of-package "apt-cache madison $package_name")"}; do + # If $package_name is a source package name, we'll have lines of the form + # $package_name | $version | ...Sources + # + # If $package_name is a binary package name, we'll have lines of the form + # $package_name | $version | ...Packages + # $src_package_name | $version | ...Sources + for name version source in "${(@s. | .)line}"; do + # Remove leading/trailing whitespace + name=${name// } + version=${version// } + source=${${source# ##}% ##} + + # Skip source packages + if [[ $name != $package_name ]] || [[ $source != *Packages* ]]; then + continue + fi + + kv+=( "${version//:/\\:}:$source" ) + done + done + + _describe -t apt-package-versions "package versions" kv "$@" +} + _apt_caching_policy () { local -a oldp |