diff options
author | David Kalnischkies <kalnischkies@gmail.com> | 2010-01-02 20:24:53 +0100 |
---|---|---|
committer | David Kalnischkies <kalnischkies@gmail.com> | 2010-01-02 20:24:53 +0100 |
commit | 6355a02fbfa1cffa9291095ede32c35737ed7419 (patch) | |
tree | a1ee26757b73cb1d8b54c5718736e9ed4baa3c66 /cmdline/apt-key | |
parent | 6aa944bc539cea4095971ccb2354c1e8f9f2c90a (diff) |
apt-key errors out nicely if wget is not installed (Closes: #545754)
Diffstat (limited to 'cmdline/apt-key')
-rwxr-xr-x | cmdline/apt-key | 9 |
1 files changed, 8 insertions, 1 deletions
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 |