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

[Joey Hess]

Author: joeyh
Date: 2005-11-15 01:34:51 +0000 (Tue, 15 Nov 2005)
New Revision: 32063

Modified:
   trunk/packages/net-retriever/debian/changelog
   trunk/packages/net-retriever/debian/control
   trunk/packages/net-retriever/net-retriever
Log:
* Use log-output for gpgv call.

Modified: trunk/packages/net-retriever/debian/changelog
===================================================================
--- trunk/packages/net-retriever/debian/changelog	2005-11-15 01:31:16 UTC (rev 32062)
+++ trunk/packages/net-retriever/debian/changelog	2005-11-15 01:34:51 UTC (rev 32063)
@@ -2,8 +2,9 @@
 
   * Consistent indentation which saved .5k.
   * Move exit calls into error function.
+  * Use log-output for gpgv call.
 
- -- Joey Hess <joeyh at debian.org>  Mon, 14 Nov 2005 20:31:27 -0500
+ -- Joey Hess <joeyh at debian.org>  Mon, 14 Nov 2005 20:35:01 -0500
 
 net-retriever (1.06) unstable; urgency=low
 

Modified: trunk/packages/net-retriever/debian/control
===================================================================
--- trunk/packages/net-retriever/debian/control	2005-11-15 01:31:16 UTC (rev 32062)
+++ trunk/packages/net-retriever/debian/control	2005-11-15 01:34:51 UTC (rev 32063)
@@ -9,7 +9,7 @@
 Package: net-retriever
 XC-Package-Type: udeb
 Architecture: all
-Depends: choose-mirror, configured-network
+Depends: choose-mirror, configured-network, debian-installer-utils (>= 1.16)
 Provides: retriever
 Description: Fetch modules from the Internet
  This is a retriever that uses wget to fetch files over http or ftp.

Modified: trunk/packages/net-retriever/net-retriever
===================================================================
--- trunk/packages/net-retriever/net-retriever	2005-11-15 01:31:16 UTC (rev 32062)
+++ trunk/packages/net-retriever/net-retriever	2005-11-15 01:34:51 UTC (rev 32063)
@@ -99,10 +99,11 @@
 			if ! fetch "dists/$suite/Release.gpg" "$Release.gpg"; then
 				error "dists/$suite/Release is unsigned."
 			fi
-			if ! gpgv --keyring "$keyring" --ignore-time-conflict \
+			if ! log-output -t net-retriever gpgv \
+			     --keyring "$keyring" --ignore-time-conflict \
 			     "$Release.gpg" "$Release"; then
 				error "Bad signature on $Release."
-			fi | logger -t net-retriever
+			fi
 		fi
 
 		ARCH=`udpkg --print-architecture`