X-Git-Url: https://pd.if.org/git/?a=blobdiff_plain;f=zpm-repo;h=d1e75fbaf5d4b5bbe106aedcf6a4924b85620291;hb=4b46503646910df3617d4f2d44112eddf75d902b;hp=a6afe35fba5088260d542d555a58b73ed38c8d39;hpb=4f0360dec786865a87b61b2fa6260082c9d42627;p=zpackage

diff --git a/zpm-repo b/zpm-repo
index a6afe35..d1e75fb 100755
--- a/zpm-repo
+++ b/zpm-repo
@@ -45,6 +45,13 @@ mkdir -p $repodir
 
 export ZPMDB
 
+warn() {
+	printf '%s:' "$0" 1>&2
+	printf ' %s' $* 1>&2
+	printf '\n' 1>&2
+	exit 1
+}
+
 die() {
 	printf '%s:' "$0" 1>&2
 	printf ' %s' $* 1>&2
@@ -92,13 +99,21 @@ update_info() {
 	for repo in "$@"; do
 		url=$(select "$repo" url)
 		rf="$repodir/$repo.repo"
+		if [ -z "$url" ]; then
+			check_for_repo "$repo" || warn "no url for repo $repo"
+			return 1
+		fi
 		if [ -f "$rf" ]; then
 			# TODO merge in so packages aren't deleted
-			curl -f '-#' -z "$rf" -o "$rf.tmp" "$url" && 
-				mv "$rf.tmp" "$rf" &&
-				refresh "$repo"
+			curl -f '-#' -z "$rf" -o "$rf.tmp" "$url"
+			rv=$?
 		else
 			curl -f '-#' -o "$rf" "$url" && refresh "$repo"
+			rv=$?
+		fi
+		if [ $rv -eq 0 ]; then
+		       	test -f "$rf.tmp" && mv "$rf.tmp" "$rf"
+			refresh "$repo"
 		fi
 	done
 }
@@ -142,6 +157,15 @@ download() {
 	done
 }
 
+check_for_repo() {
+	rn=$(select "$1" name)
+	if [ -z "$rn" ]; then
+		warn "no repository $1"
+		return 1
+	fi
+	return 0
+}
+
 case $action in
 	list)
 		select '' priority,name,url,refreshed ;;