X-Git-Url: https://pd.if.org/git/?a=blobdiff_plain;ds=sidebyside;f=zpm-install;h=47681d3c56d3dea0d2590fdb121a65efabc33514;hb=51a6d79f8a532376a9f27dbb5133bf13a5474703;hp=0bbfed5d9e4bc6d08a862a482fcd92315d95de33;hpb=6adc79aeafb90e90c9923b3eeedab662888927e9;p=zpackage

diff --git a/zpm-install b/zpm-install
index 0bbfed5..47681d3 100755
--- a/zpm-install
+++ b/zpm-install
@@ -98,6 +98,17 @@ if [ $var -gt 0 ]; then
 	zpm list -v -f $localdb -s installing 
 	die "already ($localdb) installing $var package(s)"
 fi
+# check if we're installing something already
+var=$(zpm list -f $localdb -s removing | wc -l)
+if [ $var -gt 0 ]; then
+	zpm list -v -f $localdb -s removing 
+	die "already ($localdb) removing $var package(s)"
+fi
+var=$(zpm list -f $localdb -s updating | wc -l)
+if [ $var -gt 0 ]; then
+	zpm list -v -f $localdb -s updating 
+	die "already ($localdb) updating $var package(s)"
+fi
 
 if [ -n "$rootdir" ]; then
 	ZPM_ROOT_DIR="$rootdir"
@@ -106,7 +117,7 @@ fi
 
 # TODO mark already installed packages as updating?
 for pkgstr in "$@"; do
-	pkgid=$(zpm findpkg $pkgfile $pkgstr)
+	pkgid=$(zpm findpkg -f $pkgfile $pkgstr)
 	if [ $? -ne 0 ]; then
 		# TODO log
 		die "can't find package $pkgstr in $pkgfile"