From 5207c5a5959ce677cd0c95be97a1ae6d743dfcf7 Mon Sep 17 00:00:00 2001 From: Nathan Wagner Date: Fri, 26 Oct 2018 05:03:46 +0000 Subject: [PATCH] log when aborting install --- zpm-install | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/zpm-install b/zpm-install index 29d8c5d..edd8405 100755 --- a/zpm-install +++ b/zpm-install @@ -6,6 +6,7 @@ warn() { die() { echo $* 1>&2 + zpm log -i -a 'aborting install' -p "$pkgid" "$*" exit 1 } @@ -144,11 +145,9 @@ if [ -n "$rootdir" ]; then export ZPM_ROOT_DIR fi -# TODO mark already installed packages as updating? for pkgstr in "$@"; do pkgid=$(zpm findpkg -f $pkgfile $pkgstr) if [ $? -ne 0 ]; then - # TODO log die "can't find package $pkgstr in $pkgfile" fi @@ -167,7 +166,6 @@ for pkgstr in "$@"; do # zpm runscript -p pre-upgrade $current $pkgid zpm runscript -f $pkgfile -p pre-install $pkgid $current if [ $? -ne 0 ]; then - # TODO log die "pre-install script for $pkgid failed" fi fi @@ -184,11 +182,11 @@ for pkgstr in "$@"; do zpm rmpackage $pkgid zpm merge -f $pkgfile -s installing $pkgid if [ $? -ne 0 ]; then - # TODO log die "merging $pkgid failed" fi + else + zpm pkg $pkgid status=installing fi - # TODO but need to mark as installing if not merged #zpm shell $ZPMDB 'select * from install_status' 1>&2 if [ $dryrun -gt 0 ]; then @@ -206,6 +204,7 @@ for pkgstr in "$@"; do zpm syncfs $syncopts -f $pkgfile if [ $? -ne 0 ]; then + zpm pkg $pkgid status=failed die 'zpm-syncfs failed'; fi -- 2.40.0