mergeone() {
pkgid=$1
+ package=$(zpm parse -n "$pkgid")
where="where printf('%s-%s-%s', P.package, P.version, P.release) = '$pkgid'"
if [ $update -eq 1 ]; then
printf "delete from packages_pkgid where pkgid = '%s';\n" "$pkgid"
fi
if [ $remove_older -eq 1 ]; then
- printf "delete from packages_pkgid where pkgid < '%s' collate vercmp;\n" "$pkgid"
+ printf "delete from packages_pkgid where package = '$package' and pkgid < '%s' collate vercmp;\n" "$pkgid"
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"
check_newer() {
pkg=$1
package=$(zpm parse -n "$pkg")
- newer=$(zpm shell "$target" "select 1 from packages_pkgid where '$pkg' > (select max(pkgid) collate vercmp from packages_pkgid where package = '$package')")
- if [ "$newer" = '1' ]; then
+ newer=$(zpm shell "$target" "select '$pkg' > (select max(pkgid collate vercmp) from packages_pkgid where package = '$package') from packages_pkgid where package = '$package'")
+ if [ "$newer" = '1' ] || [ -z "$newer" ]; then
return 0;
fi
return 1