[d-i-commits] r32062 - in trunk/packages/net-retriever: . debian

[Joey Hess]

Author: joeyh
Date: 2005-11-15 01:31:16 +0000 (Tue, 15 Nov 2005)
New Revision: 32062

Modified:
   trunk/packages/net-retriever/debian/changelog
   trunk/packages/net-retriever/net-retriever
Log:
* Move exit calls into error function.

Modified: trunk/packages/net-retriever/debian/changelog
===================================================================
--- trunk/packages/net-retriever/debian/changelog	2005-11-15 01:30:21 UTC (rev 32061)
+++ trunk/packages/net-retriever/debian/changelog	2005-11-15 01:31:16 UTC (rev 32062)
@@ -1,8 +1,9 @@
 net-retriever (1.07) UNRELEASED; urgency=low
 
   * Consistent indentation which saved .5k.
+  * Move exit calls into error function.
 
- -- Joey Hess <joeyh at debian.org>  Mon, 14 Nov 2005 20:29:59 -0500
+ -- Joey Hess <joeyh at debian.org>  Mon, 14 Nov 2005 20:31:27 -0500
 
 net-retriever (1.06) unstable; urgency=low
 

Modified: trunk/packages/net-retriever/net-retriever
===================================================================
--- trunk/packages/net-retriever/net-retriever	2005-11-15 01:30:21 UTC (rev 32061)
+++ trunk/packages/net-retriever/net-retriever	2005-11-15 01:31:16 UTC (rev 32062)
@@ -7,6 +7,7 @@
 }
 error() {
 	log "error: $@"
+	exit 1
 }
 
 db_get mirror/protocol
@@ -60,17 +61,14 @@
 			if [ "$file" = "$packages" ]; then
 				if [ "$md5" != "$pkgmd5" ]; then
 					error "MD5 mismatch for $packages ($md5 != $pkgmd5)."
-					exit 1
 				fi
 				if [ "$size" != "$pkgsize" ]; then
 					error "Size mismatch for $packages ($size != $pkgsize)."
-					exit 1
 				fi
 				return 0
 			fi
 		done
 		error "$packages not found in $release."
-		exit 1
 	)
 	set +e
 }
@@ -100,12 +98,10 @@
 		if type gpgv >/dev/null && [ -f "$keyring" ]; then
 			if ! fetch "dists/$suite/Release.gpg" "$Release.gpg"; then
 				error "dists/$suite/Release is unsigned."
-				exit 1
 			fi
 			if ! gpgv --keyring "$keyring" --ignore-time-conflict \
 			     "$Release.gpg" "$Release"; then
 				error "Bad signature on $Release."
-				exit 1
 			fi | logger -t net-retriever
 		fi
 
@@ -114,7 +110,6 @@
 		ret=1
 		if [ -z "$components" ]; then
 			error "No components listed in $Release."
-			exit 1
 		fi
 		for comp in $components; do
 			for ext in '.gz' ''; do