summaryrefslogtreecommitdiff
path: root/cmdline/apt-key
diff options
context:
space:
mode:
authorDavid Kalnischkies <kalnischkies@gmail.com>2010-01-13 14:51:28 +0100
committerDavid Kalnischkies <kalnischkies@gmail.com>2010-01-13 14:51:28 +0100
commitbe4eec613e34a43f34eb9a9b227b69a58fe66ec8 (patch)
treeffc2b4d427c95558bbfe8e0202724004751c5ad0 /cmdline/apt-key
parentf45fd56b58a71f2827eb8b4f96333782d84b7b63 (diff)
parent72f6c6f8d9b1a92c7795ffcfbdc3b8858eb79a70 (diff)
merge with lp:~mvo/apt/debian-sid to get 0.7.25.1 and my changes back
Diffstat (limited to 'cmdline/apt-key')
-rwxr-xr-xcmdline/apt-key11
1 files changed, 6 insertions, 5 deletions
diff --git a/cmdline/apt-key b/cmdline/apt-key
index 1950723f3..e45468fd4 100755
--- a/cmdline/apt-key
+++ b/cmdline/apt-key
@@ -132,7 +132,7 @@ usage() {
# Determine on which keyring we want to work
if [ "$1" = "--keyring" ]; then
- echo "keyfile given"
+ #echo "keyfile given"
shift
TRUSTEDFILE="$1"
if [ -r "$TRUSTEDFILE" ]; then
@@ -142,8 +142,9 @@ if [ "$1" = "--keyring" ]; then
exit 1
fi
shift
+# otherwise use the default
else
- echo "generate list"
+ #echo "generate list"
TRUSTEDFILE="/etc/apt/trusted.gpg"
if [ -r "$TRUSTEDFILE" ]; then
GPG="$GPG --keyring $TRUSTEDFILE"
@@ -151,14 +152,14 @@ else
GPG="$GPG --primary-keyring $TRUSTEDFILE"
TRUSTEDPARTS="/etc/apt/trusted.gpg.d"
if [ -d "$TRUSTEDPARTS" ]; then
- echo "parts active"
+ #echo "parts active"
for trusted in $(run-parts --list $TRUSTEDPARTS --regex '^.*\.gpg$'); do
- echo "part -> $trusted"
+ #echo "part -> $trusted"
GPG="$GPG --keyring $trusted"
done
fi
fi
-echo "COMMAND: $GPG"
+#echo "COMMAND: $GPG"
command="$1"
if [ -z "$command" ]; then