summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rwxr-xr-xcmdline/apt-key4
-rw-r--r--debian/changelog4
2 files changed, 5 insertions, 3 deletions
diff --git a/cmdline/apt-key b/cmdline/apt-key
index 3838fafcd..86e982054 100755
--- a/cmdline/apt-key
+++ b/cmdline/apt-key
@@ -59,13 +59,13 @@ 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 >&2 "ERROR: Your distribution is not supported in net-update as no uri for the archive-keyring is set"
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"
+ echo >&2 "ERROR: an installed wget is required for a network-based update"
exit 1
fi
if [ ! -d /var/lib/apt/keyrings ]; then
diff --git a/debian/changelog b/debian/changelog
index a2e08558d..b28531db7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,8 +3,10 @@ apt (0.8.15.1) unstable; urgency=low
[ David Kalnischkies ]
* doc/makefile:
- create doxygen directory to avoid depending on magic (Closes: #628799)
+ * cmdline/apt-key:
+ - explicitly state that net-update is not supported if no url is set
- -- David Kalnischkies <kalnischkies@gmail.com> Wed, 29 Jun 2011 16:37:58 +0200
+ -- David Kalnischkies <kalnischkies@gmail.com> Wed, 29 Jun 2011 17:13:26 +0200
apt (0.8.15) unstable; urgency=low