refactor(dpkg,aptitude): add held package getter to dpkg, use it

Author: scop

completions/aptitude

@@ -1,19 +1,5 @@
 # Debian aptitude(1) completion                            -*- shell-script -*-
 
-# TODO: rename per API conventions, rework to use vars rather than outputting
-if _comp_have_command grep-status; then
-    _comp_dpkg_hold_packages()
-    {
-        grep-status -P -e "^$1" -a -FStatus 'hold' -n -s Package
-    }
-else
-    _comp_dpkg_hold_packages()
-    {
-        command grep -B 2 'hold' /var/lib/dpkg/status |
-            awk "/Package: $1/ { print \$2 }"
-    }
-fi
-
 _comp_cmd_aptitude()
 {
     local cur prev words cword comp_args
@@ -41,7 +27,7 @@ _comp_cmd_aptitude()
                 return
                 ;;
             unhold)
-                COMPREPLY=($(_comp_dpkg_hold_packages "$cur"))
+                _comp_xfunc dpkg held_packages
                 return
                 ;;
         esac

completions/dpkg

@@ -30,6 +30,14 @@ else
     }
 fi
 
+# @since 2.12
+_comp_xfunc_dpkg_held_packages()
+{
+    local pkgs=$(dpkg --get-selections ${cur:+"$cur}"} |
+        awk '{for(i=2;i<=NF;i++){ if($i=="hold"){ print $1;break }}}')
+    _comp_compgen -a -- -W '$pkgs'
+}
+
 _comp_deprecate_func _comp_dpkg_installed_packages _comp_xfunc_dpkg_installed_packages
 _comp_deprecate_func _comp_dpkg_purgeable_packages _comp_xfunc_dpkg_purgeable_packages