diff options
| author | Michael Vogt <michael.vogt@ubuntu.com> | 2011-09-12 16:09:53 +0200 |
|---|---|---|
| committer | Michael Vogt <michael.vogt@ubuntu.com> | 2011-09-12 16:09:53 +0200 |
| commit | 7adf8bb88faba98793998bed1e6c60f4b5483531 (patch) | |
| tree | 4002c43084de6db6eb4f6128baa241cb6c757ba7 /cmdline/apt-key | |
| parent | 178dd062eeaa1d7e56770455e005dc27aa71f026 (diff) | |
| parent | 02679bb36369dce76f3a2159dbb829ba221c1e67 (diff) | |
merged from lp:~donkult/apt/sid
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" |