* cmdline/apt-key:

  - explicitly state that net-update is not supported if no url is set

diff --git a/cmdline/apt-key b/cmdline/apt-key
index 3838fafcd61b18f7957f6423975ac2f65153eaed..86e9820548298c8eb6b50b1cc47f7f2d30779c30 100755 (executable)
--- 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 a2e08558d5c8a65e50a649c85b3f1390b03cdd96..b28531db796fd298975b0943475bbc67d8ec8977 100644 (file)
--- 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