bin/nit-picker,lib/common-functions: separate extract_dependencies_from_package() for external reuse

1 files changed, 5 insertions, 25 deletions

diff --git a/bin/nit-picker b/bin/nit-picker
index 836e5d9..4382389 100755
--- a/bin/nit-picker
+++ b/bin/nit-picker
@@ -168,28 +168,12 @@ while pgrep -x ii >/dev/null \
           ${master_mirror_rsync_command} \
             "${master_mirror_rsync_directory}/pool/${parameters}" \
             "${tmp_dir}/"
-          bsdtar -Oxf "${tmp_dir}/${parameters}" '.PKGINFO' \
-          | sed -n '
-            s/^\(\(make\)\?depend\) = /\1 /
-            T
-            p
-          ' \
-          | sed '
-            s/\(=\|[<>]=\?\)\([^-]\+\)\(-[^-]\+\)\?$/ \1 \2/
-            t
-            s/$/ >= '"${min_version}"'/
-          ' \
-          | sed '
-            s/:\(\S\+\)$/ \1/
-            t
-            s/ \(\S\+\)$/ 0 \1/
-          ' \
-          | tr '[:upper:]' '[:lower:]' \
-          | sort -u \
-          > "${tmp_dir}/pkg-deps"
+          extract_dependencies_from_package \
+            "${tmp_dir}/${parameters}" \
+            "${tmp_dir}/pkg-deps"
           {
             printf 'SELECT'
-            printf ' IF(`dependency_types`.`name`="run","depend","makedepend"),'
+            printf ' `dependency_types`.`name`,'
             printf '`install_targets`.`name`,'
             printf '`dependencies`.`version_relation`,'
             printf '`versions`.`epoch`,'
@@ -204,15 +188,11 @@ while pgrep -x ii >/dev/null \
             mysql_package_name_query
             printf '="%s"' \
               "${parameters}"
-            printf ' AND `dependency_types`.`name` IN ("run","make")'
+            printf ' AND `dependency_types`.`name` IN ("run","make","check")'
             printf ';\n'
           } \
           | mysql_run_query \
           | tr '\t' ' ' \
-          | sed '
-            /^depend base >= '"${min_version%:*}"' '"${min_version#*:}"'$/d
-            /^makedepend base-devel >= '"${min_version%:*}"' '"${min_version#*:}"'$/d
-          ' \
           | sort -u \
           > "${tmp_dir}/db-deps"
           if ! diff -q "${tmp_dir}/db-deps" "${tmp_dir}/pkg-deps"; then