X-Git-Url: https://pd.if.org/git/?p=zpackage;a=blobdiff_plain;f=zpm-pkgdeps;h=4a0528fa5e987d076641b0c78bc10a1de9da8762;hp=b24eea4ce629f5f0fca3b9c623dfb0016ad11d37;hb=df90ec17796ac5e86bc8c38ff09b451b6a022e1b;hpb=6ff53c22d4ab08760c5e8747cd12e4f8bc0b82f6

diff --git a/zpm-pkgdeps b/zpm-pkgdeps
index b24eea4..4a0528f 100755
--- a/zpm-pkgdeps
+++ b/zpm-pkgdeps
@@ -39,18 +39,20 @@ eval $(zpm parse -E "$pkgid")
 package=$(zpm quote -q "$name")
 version=$(zpm quote -q "$version")
 pkgselector="P.package = $package and P.version = $version and P.release = $release"
+selector="package = $package and version = $version and 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 P where %s and requires = %s;\n'
-cleardeps='delete from packagedeps P where %s;\n'
+rmdep='delete from packagedeps where %s and requires = %s;\n'
+cleardeps='delete from packagedeps 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";
+	printf ".bail on\n"
+	printf ".log stderr\n"
 	printf "begin;\n";
 if [ $clearlist -eq 1 ]; then
-	printf "$cleardeps" "$pkgselector"
+	printf "$cleardeps" "$selector"
 fi
 if [ -n "$setlist" ]; then
 	for dep in $setlist; do
@@ -67,7 +69,7 @@ fi
 if [ -n "$remove" ]; then
 	for dep in $remove; do
 		qdep=$(zpm quote -q "$dep")
-		printf "$rmdep" "$pkgselector" "$qdep"
+		printf "$rmdep" "$selector" "$qdep"
 	done
 fi
 if [ $quiet -eq 0 ]; then