# -F include file content
# -S don't include script content
-die() {
+warn() {
printf 'zpm-merge:' 1>&2
printf ' %s' "$@" 1>&2
printf '\n' 1>&2
exit 1
}
+die() {
+ warn "$@"
+ exit 1
+}
+
verbose=0
mergefiles=0
mergescripts=1
mergeall=1
update=0
+remove_older=0
+only_if_newer=0
target=${ZPMDB:=/var/lib/zpm/local.db}
+# TODO option to only update if new
+# new is hash is different or build time is later
# TODO option to merge all packages found in pkgfile
-while getopts :f:vd:FSs:au opt; do
+while getopts :f:vd:FSs:auon opt; do
case $opt in
f) pkgfile="$OPTARG" ;;
- v) verbose=1 ;;
+ v) verbose=$(( verbose + 1 )) ;;
d) target="$OPTARG" ;;
F) mergefiles=1 ;;
S) mergescripts=0 ;;
s) newstatus="$OPTARG" ;;
a) mergeall=1 ;;
u) update=1 ;;
-
+ o) remove_older=1 ;;
+ n) only_if_newer=1 ;;
*) echo 'zpm-merge unknown option' $OPTARG; exit 1 ;;
esac
done
pkgfile="$pkgid.zpm"
fi
- if [ $verbose -gt 0 ]; then
+ if [ $verbose -gt 1 ]; then
echo merging $pkgfile $pkgid into $target
fi
pkglist=$pkgid
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 P %s;\n" "$where"
+ printf "delete from packages_pkgid where pkgid = '%s';\n" "$pkgid"
+ fi
+ if [ $remove_older -eq 1 ]; then
+ 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"
fi
fi
+check_newer() {
+ pkg=$1
+ package=$(zpm parse -n "$pkg")
+ newer=$(zpm shell "$target" "select '$pkg' > (select max(pkgid collate vercmp) from packages_pkgid where package = '$package') collate vercmp")
+ if [ "$newer" = '1' ] || [ -z "$newer" ]; then
+ return 0
+ fi
+ return 1
+}
+
+mlist="$pkglist"
+if [ $only_if_newer -eq 1 ]; then
+ mlist=
+ for pkgid in $pkglist; do
+ if check_newer "$pkgid" ; then
+ mlist="$mlist $pkgid"
+ fi
+ done
+ if [ -z "$mlist" ]; then
+ exit 0
+ fi
+fi
+
# TODO file tags and package tags
{
printf ".bail on\n"