X-Git-Url: https://pd.if.org/git/?a=blobdiff_plain;f=zpm-merge;h=8747a6bd4dc6b6175b15049a7775edb8b97291f0;hb=9837530d635f890b5e15c0cb7653aadaf587dc5c;hp=8b481688eab94be99531d16dc7e4ecb1e7ed052d;hpb=987426b66bb6acbef1e3da4485caa027ef106bc1;p=zpackage diff --git a/zpm-merge b/zpm-merge index 8b48168..8747a6b 100755 --- a/zpm-merge +++ b/zpm-merge @@ -114,7 +114,7 @@ mergeone() { pkgid=$1 where="where printf('%s-%s-%s', P.package, P.version, P.release) = '$pkgid'" if [ $update -eq 1 ]; then - printf "delete from packages %s;\n" "$where" + printf "delete from packages P %s;\n" "$where" fi printf "insert or rollback into packages select * from remote.packages P %s;\n" "$where" printf "insert or rollback into packagefiles select * from remote.packagefiles P %s;\n" "$where" @@ -167,3 +167,7 @@ fi printf "commit;\n" } | zpm shell $target + +if [ $verbose -ne 0 ]; then + printf "%s\n" $pkglist +fi