X-Git-Url: https://pd.if.org/git/?a=blobdiff_plain;f=zpm-merge;h=87954dec2fef05abe6da0cb8bed898cb7ba24e1b;hb=1972c1f6ac1502e3b06b77d7c04454c5d0a9dc9f;hp=f6529ceba45ca8055c0403d2700f24df888fac75;hpb=f0762b0c3b82fd7d56d5ea90554967a184ec14be;p=zpackage diff --git a/zpm-merge b/zpm-merge index f6529ce..87954de 100755 --- a/zpm-merge +++ b/zpm-merge @@ -164,8 +164,8 @@ fi 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') and 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