From d1ba8bc5b1082bf13ea3b3a7d8b7b688191c766d Mon Sep 17 00:00:00 2001 From: Nathan Wagner Date: Tue, 26 Feb 2019 19:33:47 +0000 Subject: [PATCH] expand pkgdeps --- zpm-pkgdeps | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) diff --git a/zpm-pkgdeps b/zpm-pkgdeps index b1ea0ce..b24eea4 100755 --- a/zpm-pkgdeps +++ b/zpm-pkgdeps @@ -5,8 +5,10 @@ remove= setlist= quiet=0 clearlist=0 +includelibs=1 +resolvelibs=0 -while getopts :f:s:a:r:qc opt; do +while getopts :f:s:a:r:qcLR opt; do case $opt in f) pkgfile="$OPTARG" ;; s) setlist="$setlist $OPTARG"; clearlist=1 ;; @@ -14,6 +16,8 @@ while getopts :f:s:a:r:qc opt; do r) remove="$remove $OPTARG" ;; q) quiet=1 ;; c) clearlist=1 ;; + L) includelibs=0 ;; + R) resolvelibs=1 ;; esac done shift $(( OPTIND - 1)) @@ -34,11 +38,13 @@ fi eval $(zpm parse -E "$pkgid") package=$(zpm quote -q "$name") version=$(zpm quote -q "$version") -pkgselector="package = $package and version = $version and release = $release" -listdeps="select requires from packagedeps where %s;\n" +pkgselector="P.package = $package and P.version = $version and P.release = $release" +listdeps="select requires from packagedeps P where %s;\n" adddep='insert or ignore into packagedeps (package,version,release,requires) values (%s,%s,%d,%s);\n' -rmdep='delete from packagedeps where %s and requires = %s;\n' -cleardeps='delete from packagedeps where %s;\n' +rmdep='delete from packagedeps P where %s and requires = %s;\n' +cleardeps='delete from packagedeps P where %s;\n' +libdeps="select distinct EN.needed from elfneeded EN join packagefiles P on P.hash = EN.file where %s;\n" +resolvelibs="select distinct EN.needed from elfneeded EN join packagefiles PF on PF.hash = EN.file left join where %s;\n" { printf ".bail on\n"; @@ -66,6 +72,9 @@ if [ -n "$remove" ]; then fi if [ $quiet -eq 0 ]; then printf "$listdeps" "$pkgselector" + if [ $includelibs -eq 1 ]; then + printf "$libdeps" "$pkgselector" + fi fi printf "commit;\n"; } | zpm shell $pkgfile -- 2.40.0