From 6355a02fbfa1cffa9291095ede32c35737ed7419 Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Sat, 2 Jan 2010 20:24:53 +0100 Subject: apt-key errors out nicely if wget is not installed (Closes: #545754) --- cmdline/apt-key | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) (limited to 'cmdline') diff --git a/cmdline/apt-key b/cmdline/apt-key index 5f4e02fdf..24010edf3 100755 --- a/cmdline/apt-key +++ b/cmdline/apt-key @@ -56,7 +56,14 @@ add_keys_with_verify_against_master_keyring() { # (otherwise it does not make sense from a security POV) net_update() { if [ -z "$ARCHIVE_KEYRING_URI" ]; then - echo "ERROR: no location for the archive-keyring given" + echo "ERROR: no location for the archive-keyring given" + exit 1 + fi + # in theory we would need to depend on wget for this, but this feature + # isn't useable in debian anyway as we have no keyring uri nor a master key + if ! which wget >/dev/null 2>&1; then + echo "ERROR: an installed wget is required for a network-based update" + exit 1 fi if [ ! -d /var/lib/apt/keyrings ]; then mkdir -p /var/lib/apt/keyrings -- cgit v1.2.3