diff options
| author | Michael Vogt <michael.vogt@ubuntu.com> | 2011-11-10 16:32:52 +0100 |
|---|---|---|
| committer | Michael Vogt <michael.vogt@ubuntu.com> | 2011-11-10 16:32:52 +0100 |
| commit | 71ecaad29d8066a494f516efc5efd80860653fe2 (patch) | |
| tree | b0769df88e2b6496f23e3d899aeb1c240a3488d9 /cmdline/apt-key | |
| parent | a865ed25fa54514224cf4d6f83dd9cf48b7ed02b (diff) | |
| parent | 37adedc9d0b66eeae7efb88aebd08dfbc6e06f77 (diff) | |
merged from http://bzr.debian.org/bzr/apt/apt/debian-experimental2
Diffstat (limited to 'cmdline/apt-key')
| -rwxr-xr-x | cmdline/apt-key | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/cmdline/apt-key b/cmdline/apt-key index e632be706..97d6e0323 100755 --- a/cmdline/apt-key +++ b/cmdline/apt-key @@ -152,7 +152,7 @@ if [ "$1" = "--keyring" ]; then #echo "keyfile given" shift TRUSTEDFILE="$1" - if [ -r "$TRUSTEDFILE" ]; then + if [ -r "$TRUSTEDFILE" ] || [ "$2" = 'add' ]; then GPG="$GPG --keyring $TRUSTEDFILE --primary-keyring $TRUSTEDFILE" else echo >&2 "Error: The specified keyring »$TRUSTEDFILE« is missing or not readable" |